1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/video/pnx4008/pnxrgbfb.c b/drivers/video/pnx4008/pnxrgbfb.c
index 685761a0732c..4db6b48a8715 100644
--- a/drivers/video/pnx4008/pnxrgbfb.c
+++ b/drivers/video/pnx4008/pnxrgbfb.c
@@ -100,7 +100,6 @@ static int rgbfb_remove(struct platform_device *pdev)
                 fb_dealloc_cmap(&info->cmap);
                 framebuffer_release(info);
                 platform_set_drvdata(pdev, NULL);
-                kfree(info);
         }
 
         pnx4008_free_dum_channel(channel_owned, pdev->id);
@@ -168,23 +167,21 @@ static int __devinit rgbfb_probe(struct platform_device *pdev)
 
         ret = fb_alloc_cmap(&info->cmap, 256, 0);
         if (ret < 0)
-                goto err2;
+                goto err1;
 
         ret = register_framebuffer(info);
         if (ret < 0)
-                goto err3;
+                goto err2;
         platform_set_drvdata(pdev, info);
 
         return 0;
 
-err3:
-        fb_dealloc_cmap(&info->cmap);
 err2:
-        framebuffer_release(info);
+        fb_dealloc_cmap(&info->cmap);
 err1:
         pnx4008_free_dum_channel(channel_owned, pdev->id);
 err0:
-        kfree(info);
+        framebuffer_release(info);
 err:
         return ret;
 }