From: "Bruno Prémont" <bonbons@linux-vserver.org>
To: Richard Purdie <rpurdie@linux.intel.com>,
Mike Frysinger <vapier@gentoo.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org
Subject: [PATCH] backlight, blackfin: fix missing registration failure
Date: Fri, 26 Feb 2010 12:04:54 +0000 [thread overview]
Message-ID: <20100226130454.228af99a@neptune.home> (raw)
In-Reply-To: 20100221002831.689bace8@neptune.home
Check newly registered backlight_device for error and properly
return error to parent
Mark struct backlight_ops as const.
Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Acked-by: Mike Frysinger <vapier@gentoo.org> (constify struct backlight_ops)
---
drivers/video/bf54x-lq043fb.c | 10 +++++++++-
drivers/video/bfin-t350mcqb-fb.c | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index db4e6f7..a589216 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -463,7 +463,7 @@ static int bl_get_brightness(struct backlight_device *bd)
return 0;
}
-static struct backlight_ops bfin_lq043fb_bl_ops = {
+static const struct backlight_ops bfin_lq043fb_bl_ops = {
.get_brightness = bl_get_brightness,
};
@@ -678,6 +678,12 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
bl_dev backlight_device_register("bf54x-bl", NULL, NULL,
&bfin_lq043fb_bl_ops);
+ if (IS_ERR(bl_dev)) {
+ printk(KERN_ERR DRIVER_NAME
+ ": unable to register backlight.\n");
+ ret = -EINVAL;
+ goto out9;
+ }
bl_dev->props.max_brightness = 255;
lcd_dev = lcd_device_register(DRIVER_NAME, &pdev->dev, NULL, &bfin_lcd_ops);
@@ -686,6 +692,8 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
return 0;
+out9:
+ unregister_framebuffer(fbinfo);
out8:
free_irq(info->irq, info);
out7:
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c
index bc204c6..fe1492b 100644
--- a/drivers/video/bfin-t350mcqb-fb.c
+++ b/drivers/video/bfin-t350mcqb-fb.c
@@ -381,7 +381,7 @@ static int bl_get_brightness(struct backlight_device *bd)
return 0;
}
-static struct backlight_ops bfin_lq043fb_bl_ops = {
+static const struct backlight_ops bfin_lq043fb_bl_ops = {
.get_brightness = bl_get_brightness,
};
@@ -572,6 +572,12 @@ static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
bl_dev backlight_device_register("bf52x-bl", NULL, NULL,
&bfin_lq043fb_bl_ops);
+ if (IS_ERR(bl_dev)) {
+ printk(KERN_ERR DRIVER_NAME
+ ": unable to register backlight.\n");
+ ret = -EINVAL;
+ goto out9;
+ }
bl_dev->props.max_brightness = 255;
lcd_dev = lcd_device_register(DRIVER_NAME, NULL, &bfin_lcd_ops);
@@ -580,6 +586,8 @@ static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
return 0;
+out9:
+ unregister_framebuffer(fbinfo);
out8:
free_irq(info->irq, info);
out7:
--
1.6.4.4
prev parent reply other threads:[~2010-02-26 12:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-20 23:10 [Patch 0/3] backlight Bruno Prémont
2010-02-20 23:18 ` [PATCH 2/3] backlight: mark struct backlight_ops const Bruno Prémont
[not found] ` <20100221001851.673db863-hY15tx4IgV39zxVx7UNMDg@public.gmane.org>
2010-02-22 19:35 ` Mike Frysinger
2010-02-26 11:56 ` [PATCH] " Bruno Prémont
2010-02-20 23:20 ` [PATCH 1/3] backlight: Add backlight_device parameter to check_fb Bruno Prémont
[not found] ` <20100221002001.0a7e05a7-hY15tx4IgV39zxVx7UNMDg@public.gmane.org>
2010-02-24 16:00 ` [PATCH 1/3] picolcd: driver for PicoLCD HID device Bruno Prémont
2010-02-24 18:27 ` Oliver Neukum
[not found] ` <201002241927.53532.oliver-GvhC2dPhHPQdnm+yROfE0A@public.gmane.org>
2010-02-24 21:44 ` Rick L. Vinyard, Jr.
2010-02-25 4:11 ` Oliver Neukum
2010-02-25 11:00 ` Jiri Kosina
2010-02-25 15:34 ` Rick L. Vinyard, Jr.
2010-02-26 8:12 ` Dmitry Torokhov
[not found] ` <20100224170049.0d04af3c-hY15tx4IgV39zxVx7UNMDg@public.gmane.org>
2010-02-25 11:07 ` Jiri Kosina
[not found] ` <alpine.LNX.2.00.1002251201430.30967-ztGlSCb7Y1iN3ZZ/Hiejyg@public.gmane.org>
2010-02-25 11:32 ` Bruno Prémont
2010-02-25 15:18 ` Jiri Kosina
2010-02-25 15:29 ` Bruno Prémont
[not found] ` <20100225123214.0523a310-hY15tx4IgV39zxVx7UNMDg@public.gmane.org>
2010-02-25 17:52 ` Rick L. Vinyard, Jr.
2010-02-26 8:15 ` Dmitry Torokhov
2010-03-03 6:04 ` Pavel Machek
2010-02-26 11:53 ` [PATCH] backlight: Add backlight_device parameter to check_fb Bruno Prémont
2010-02-20 23:28 ` [PATCH 3/3] backlight: fix missing/incomplete registration failure Bruno Prémont
2010-02-21 13:35 ` [PATCH 3/3] backlight: fix missing/incomplete registration Thadeu Lima de Souza Cascardo
2010-02-24 15:33 ` Anisse Astier
2010-02-26 12:04 ` Bruno Prémont [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100226130454.228af99a@neptune.home \
--to=bonbons@linux-vserver.org \
--cc=akpm@linux-foundation.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rpurdie@linux.intel.com \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).