projects
/
platform
/
kernel
/
linux-rpi3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2a6fc5
)
neofb: fix error return code in neofb_probe()
author
Wei Yongjun
<yongjun_wei@trendmicro.com.cn>
Mon, 23 Sep 2013 15:00:34 +0000
(23:00 +0800)
committer
Tomi Valkeinen
<tomi.valkeinen@ti.com>
Thu, 26 Sep 2013 08:45:16 +0000
(11:45 +0300)
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>
drivers/video/neofb.c
patch
|
blob
|
history
diff --git
a/drivers/video/neofb.c
b/drivers/video/neofb.c
index
7ef079c
..
c172a52
100644
(file)
--- 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);