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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Linus Torvalds 13 years ago c4c80f63 8f09aacf

+3 -2

2 changed files

expand all

drivers

video

fbmon.c

uvesafb.c

+1 -1

drivers/video/fbmon.c

··· 1400 1400 fbmode->vmode = 0; 1401 1401 if (vm->dmt_flags & VESA_DMT_HSYNC_HIGH) 1402 1402 fbmode->sync |= FB_SYNC_HOR_HIGH_ACT; 1403 - if (vm->dmt_flags & VESA_DMT_HSYNC_HIGH) 1403 + if (vm->dmt_flags & VESA_DMT_VSYNC_HIGH) 1404 1404 fbmode->sync |= FB_SYNC_VERT_HIGH_ACT; 1405 1405 if (vm->data_flags & DISPLAY_FLAGS_INTERLACED) 1406 1406 fbmode->vmode |= FB_VMODE_INTERLACED;

+2 -1

drivers/video/uvesafb.c

··· 1973 1973 err = -ENOMEM; 1974 1974 1975 1975 if (err) { 1976 - platform_device_put(uvesafb_device); 1976 + if (uvesafb_device) 1977 + platform_device_put(uvesafb_device); 1977 1978 platform_driver_unregister(&uvesafb_driver); 1978 1979 cn_del_callback(&uvesafb_cn_id); 1979 1980 return err;