summaryrefslogtreecommitdiffstats
path: root/drivers/video/hecubafb.c
diff options
context:
space:
mode:
authorJames Bottomley <JBottomley@Parallels.com>2011-07-23 19:09:03 +0200
committerJames Bottomley <JBottomley@Parallels.com>2011-07-23 19:09:03 +0200
commit87045b033a62777337ae4aa62834876da09b5fb5 (patch)
tree26aefd28e436668ff906e42b1e0d75c056e33e01 /drivers/video/hecubafb.c
parent[SCSI] bnx2i: Fixed kernel panic due to illegal usage of sc->request->cpu (diff)
parent[SCSI] fix crash in scsi_dispatch_cmd() (diff)
downloadlinux-87045b033a62777337ae4aa62834876da09b5fb5.tar.xz
linux-87045b033a62777337ae4aa62834876da09b5fb5.zip
Merge branch 'scsi-fixes'
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;
}