aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/hecubafb.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-04 15:53:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-04 15:53:53 -0700
commitaababb9766f0e874da26a17acbbec867bf9501f0 (patch)
tree4dea1f04d8c6d66ce00bb0ab49b939c165c3f33b /drivers/video/hecubafb.c
parentb2bc4782191cb574924a1d09f48083ea8b33a93b (diff)
parent3e86f1d8e397b1ef59a97910089e16a99e8f31f7 (diff)
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x
* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x: vesafb: fix memory leak fbdev: amba: Link fb device to its parent fsl-diu-fb: remove check for pixel clock ranges udlfb: Correct sub-optimal resolution selection. hecubafb: add module_put on error path in hecubafb_probe() sm501fb: fix section mismatch warning gx1fb: Fix section mismatch warnings fbdev: sh_mobile_meram: Correct pointer check for YCbCr chroma plane
Diffstat (limited to 'drivers/video/hecubafb.c')
-rw-r--r--drivers/video/hecubafb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/hecubafb.c b/drivers/video/hecubafb.c
index fbef15f7a218..614251a9af91 100644
--- a/drivers/video/hecubafb.c
+++ b/drivers/video/hecubafb.c
@@ -233,7 +233,7 @@ static int __devinit hecubafb_probe(struct platform_device *dev)
videomemory = vzalloc(videomemorysize);
if (!videomemory)
- return retval;
+ goto err_videomem_alloc;
info = framebuffer_alloc(sizeof(struct hecubafb_par), &dev->dev);
if (!info)
@@ -275,6 +275,7 @@ err_fbreg:
framebuffer_release(info);
err_fballoc:
vfree(videomemory);
+err_videomem_alloc:
module_put(board->owner);
return retval;
}

Privacy Policy