diff --git a/[refs] b/[refs] index c20823289081..c58cbfffe5a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f11b478d461b7113eb4603b3914aaf15b7788e87 +refs/heads/master: f35691062a138484b51bf53b36ae8a4495d8fb91 diff --git a/trunk/drivers/video/gbefb.c b/trunk/drivers/video/gbefb.c index ca3355e430bf..933899dca33a 100644 --- a/trunk/drivers/video/gbefb.c +++ b/trunk/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