diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-09-23 23:00:34 +0800 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-09-26 11:45:16 +0300 |
| commit | 8c42cf75490a90f6016a027765a4f053d7ba2f37 (patch) | |
| tree | abd63a1c15e2cf4a222dc1dd2904b628599541a7 /drivers/video | |
| parent | a2a6fc5f182fdb179a4f5262ee77c2c2684fe0cd (diff) | |
| download | blackbird-op-linux-8c42cf75490a90f6016a027765a4f053d7ba2f37.tar.gz blackbird-op-linux-8c42cf75490a90f6016a027765a4f053d7ba2f37.zip | |
neofb: fix error return code in neofb_probe()
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
| -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); |
