Skip to content

Commit

Permalink
neofb: fix error return code in neofb_probe()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wei Yongjun authored and Tomi Valkeinen committed Sep 26, 2013
1 parent a2a6fc5 commit 8c42cf7
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/video/neofb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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);
Expand Down

0 comments on commit 8c42cf7

Please sign in to comment.