Merge tag 'fbdev-fixes-3.9-rc6' of git://gitorious.org/linux-omap-dss2/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 committed 13 years ago

Commit c4c80f62 parents 8f09aac 090da752 files · +3 −2Browse files

Unified · Split

2 files

drivers/video/fbmon.c +1 −1
drivers/video/uvesafb.c +2 −1

drivers/video/fbmon.c+1−1

@@ -1400,7 +1400,7 @@ int fb_videomode_from_videomode(const struct videomode *vm, · 1399 unmodified lines
1400	fbmode->vmode = 0;	1400	fbmode->vmode = 0;
1401	if (vm->dmt_flags & VESA_DMT_HSYNC_HIGH)	1401	if (vm->dmt_flags & VESA_DMT_HSYNC_HIGH)
1402	fbmode->sync \|= FB_SYNC_HOR_HIGH_ACT;	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	fbmode->sync \|= FB_SYNC_VERT_HIGH_ACT;	1404	fbmode->sync \|= FB_SYNC_VERT_HIGH_ACT;
1405	if (vm->data_flags & DISPLAY_FLAGS_INTERLACED)	1405	if (vm->data_flags & DISPLAY_FLAGS_INTERLACED)
1406	fbmode->vmode \|= FB_VMODE_INTERLACED;	1406	fbmode->vmode \|= FB_VMODE_INTERLACED;

drivers/video/uvesafb.c+2−1

@@ -1973,7 +1973,8 @@ static int uvesafb_init(void) · 1972 unmodified lines
1973	err = -ENOMEM;	1973	err = -ENOMEM;
1974		1974
1975	if (err) {	1975	if (err) {
1976	platform_device_put(uvesafb_device);	1976	if (uvesafb_device)
		1977	platform_device_put(uvesafb_device);
1977	platform_driver_unregister(&uvesafb_driver);	1978	platform_driver_unregister(&uvesafb_driver);
1978	cn_del_callback(&uvesafb_cn_id);	1979	cn_del_callback(&uvesafb_cn_id);
1979	return err;	1980	return err;