Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / video / gbefb.c

diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index ca3355e430bfd18ac5e55897fd4cab633d3772f8..933899dca33a9ff4bd4cba5674ec2880a6a278c9 100644 (file)
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -1143,8 +1143,10 @@ static int __devinit gbefb_probe(struct platform_device *p_dev)
                return -ENOMEM;
 
 #ifndef MODULE
-       if (fb_get_options("gbefb", &options))
-               return -ENODEV;
+       if (fb_get_options("gbefb", &options)) {
+               ret = -ENODEV;
+               goto out_release_framebuffer;
+       }
        gbefb_setup(options);
 #endif