lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'fbdev-fixes-3.9-rc6' of git://gitorious.org/linux-omap-dss2/linux

Browse Source 
Pull fbdev fixes from Tomi Valkeinen:
 "Fix uvesafb crash bug and typoed flag name in fbmon's new videomode
  code"

* tag 'fbdev-fixes-3.9-rc6' of git://gitorious.org/linux-omap-dss2/linux:
  video:uvesafb: Fix dereference NULL pointer code path
  fbmon: use VESA_DMT_VSYNC_HIGH to fix typo
This commit is contained in:
Linus Torvalds
2013-04-05 09:15:46 -07:00
parent 8f09aacfa6 090da752cd
commit c4c80f63fb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/fbmon.c
View File

@@ -1400,7 +1400,7 @@ int fb_videomode_from_videomode(const struct videomode *vm,
fbmode->vmode = 0; fbmode->vmode = 0;
if (vm->dmt_flags & VESA_DMT_HSYNC_HIGH) if (vm->dmt_flags & VESA_DMT_HSYNC_HIGH)
fbmode->sync |= FB_SYNC_HOR_HIGH_ACT; fbmode->sync |= FB_SYNC_HOR_HIGH_ACT;
if (vm->dmt_flags & VESA_DMT_HSYNC_HIGH) if (vm->dmt_flags & VESA_DMT_VSYNC_HIGH)
fbmode->sync |= FB_SYNC_VERT_HIGH_ACT; fbmode->sync |= FB_SYNC_VERT_HIGH_ACT;
if (vm->data_flags & DISPLAY_FLAGS_INTERLACED) if (vm->data_flags & DISPLAY_FLAGS_INTERLACED)
fbmode->vmode |= FB_VMODE_INTERLACED; fbmode->vmode |= FB_VMODE_INTERLACED;

1
drivers/video/uvesafb.c
View File

@@ -1973,6 +1973,7 @@ static int uvesafb_init(void)
err = -ENOMEM; err = -ENOMEM;
if (err) { if (err) {
if (uvesafb_device)
platform_device_put(uvesafb_device); platform_device_put(uvesafb_device);
platform_driver_unregister(&uvesafb_driver); platform_driver_unregister(&uvesafb_driver);
cn_del_callback(&uvesafb_cn_id); cn_del_callback(&uvesafb_cn_id);