diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-27 20:32:09 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-27 20:32:09 +0400 |
| commit | d3aa02695bec49cc4d2cc36df67c22a162e0f1a4 (patch) | |
| tree | 1f26f2f2f9fe0209a49140d6aa705133f5a39f7f /drivers/video/neofb.c | |
| parent | e1f8826f5159d4aca5709c5d8d427319665fd5a1 (diff) | |
| parent | 6d0bb818041a02be682abadb3ba35ff608f7d60a (diff) | |
| download | linux-d3aa02695bec49cc4d2cc36df67c22a162e0f1a4.tar.xz | |
Merge tag 'fbdev-fixes-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev fixes from Tomi Valkeinen:
"Small fbdev fixes for various fb drivers"
* tag 'fbdev-fixes-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
video: mxsfb: Add missing break
video: of: display_timing: correct display-timings node finding
neofb: fix error return code in neofb_probe()
s3fb: fix error return code in s3_pci_probe()
video: mmp: drop needless devm cleanup
OMAPDSS: Add missing dependency on backlight for DSI-CM panel drier
OMAPDSS: DISPC: set irq_safe for runtime PM
OMAPDSS: Return right error during connector probe
Diffstat (limited to 'drivers/video/neofb.c')
| -rw-r--r-- | drivers/video/neofb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c index 7ef079c146e7..c172a5281f9e 100644 --- a/drivers/video/neofb.c +++ b/drivers/video/neofb.c @@ -2075,6 +2075,7 @@ static int neofb_probe(struct pci_dev *dev, const struct pci_device_id *id) if (!fb_find_mode(&info->var, info, mode_option, NULL, 0, info->monspecs.modedb, 16)) { printk(KERN_ERR "neofb: Unable to find usable video mode.\n"); + err = -EINVAL; goto err_map_video; } @@ -2097,7 +2098,8 @@ static int neofb_probe(struct pci_dev *dev, const struct pci_device_id *id) info->fix.smem_len >> 10, info->var.xres, info->var.yres, h_sync / 1000, h_sync % 1000, v_sync); - if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) + err = fb_alloc_cmap(&info->cmap, 256, 0); + if (err < 0) goto err_map_video; err = register_framebuffer(info); |