From 1ae6539bff7c9e5facff1d4463b4ec5c7d6b2ac7 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 27 Oct 2010 15:33:28 -0700 Subject: [PATCH] --- yaml --- r: 218519 b: refs/heads/master c: f35691062a138484b51bf53b36ae8a4495d8fb91 h: refs/heads/master i: 218517: d152d89bc7ab02277ecffab83f4fdda2323ca6fe 218515: f5283af384e948f54020af1ed9a12e6fd2b3b0e3 218511: b73cac9ba8622702437a79cbbf1775a90c29c4cf v: v3 --- [refs] | 2 +- trunk/drivers/video/gbefb.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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