[PATCH 610/961] staging: gma500: fix some swapped gotos
Greg Kroah-Hartman
gregkh at suse.de
Wed Mar 16 21:04:13 UTC 2011
From: Dan Carpenter <error27 at gmail.com>
These gotos were swapped. In the original code, the first would result
in a NULL dereference and the second would result in a memory leak.
Signed-off-by: Dan Carpenter <error27 at gmail.com>
Cc: Alan Cox <alan at linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/staging/gma500/psb_fb.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/gma500/psb_fb.c b/drivers/staging/gma500/psb_fb.c
index 94d8457..f67f53b 100644
--- a/drivers/staging/gma500/psb_fb.c
+++ b/drivers/staging/gma500/psb_fb.c
@@ -460,7 +460,7 @@ static int psbfb_create(struct psb_fbdev *fbdev,
if (!fb) {
DRM_ERROR("failed to allocate fb.\n");
ret = -ENOMEM;
- goto out_err0;
+ goto out_err1;
}
psbfb = to_psb_fb(fb);
psbfb->size = size;
@@ -468,7 +468,7 @@ static int psbfb_create(struct psb_fbdev *fbdev,
info = framebuffer_alloc(sizeof(struct psb_fbdev), device);
if (!info) {
ret = -ENOMEM;
- goto out_err1;
+ goto out_err0;
}
info->par = fbdev;
--
1.7.4.1
More information about the devel
mailing list