diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-05 16:15:46 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-05 16:15:46 (GMT) |
| commit | c4c80f63fb97cd9a82cd35579eeb6467f3d485fc (patch) | |
| tree | d8cf6df01b1c8580b94bfe8fb9ba5cd8b37fbc79 /drivers | |
| parent | 8f09aacfa6cf64c469fe60c05dfc1bd75e8615ed (diff) | |
| parent | 090da752cdd6f0786eee68c8dea8db7c8abd3798 (diff) | |
| download | linux-c4c80f63fb97cd9a82cd35579eeb6467f3d485fc.tar.xz | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/fbmon.c | 2 | ||||
| -rw-r--r-- | drivers/video/uvesafb.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c index 94ad0f7..7f67099 100644 --- a/drivers/video/fbmon.c +++ b/drivers/video/fbmon.c @@ -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; diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c index b75db01..d428445 100644 --- a/drivers/video/uvesafb.c +++ b/drivers/video/uvesafb.c @@ -1973,7 +1973,8 @@ static int uvesafb_init(void) err = -ENOMEM; if (err) { - platform_device_put(uvesafb_device); + if (uvesafb_device) + platform_device_put(uvesafb_device); platform_driver_unregister(&uvesafb_driver); cn_del_callback(&uvesafb_cn_id); return err; |