Merge tag 'fbdev-fixes-3.9-rc6' of git://gitorious.org/linux-omap-dss2/linux (c4c80f63) · Commits · 戴 / test

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

drivers/video/fbmon.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1400,7 +1400,7 @@ int fb_videomode_from_videomode(const struct videomode *vm,
		fbmode->vmode = 0;
		if (vm->dmt_flags & VESA_DMT_HSYNC_HIGH)
		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;
		if (vm->data_flags & DISPLAY_FLAGS_INTERLACED)
		fbmode->vmode \|= FB_VMODE_INTERLACED;

drivers/video/uvesafb.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1973,6 +1973,7 @@ static int uvesafb_init(void)
		err = -ENOMEM;

		if (err) {
		if (uvesafb_device)
		platform_device_put(uvesafb_device);
		platform_driver_unregister(&uvesafb_driver);
		cn_del_callback(&uvesafb_cn_id);

Admin message