mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Bruno Prémont" <bonbons@linux-vserver.org>
To: Richard Purdie <rpurdie@linux.intel.com>,
	Len Brown <len.brown@intel.com>, Thomas Renninger <trenn@suse.de>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] backlight, msi-laptop, msi-wmi: fix incomplete registration failure handling
Date: Fri, 26 Feb 2010 13:17:16 +0100	[thread overview]
Message-ID: <20100226131716.77d351ce@neptune.home> (raw)
In-Reply-To: <20100221002831.689bace8@neptune.home>

Properly return backlight registration error to parent.
Mark struct backlight_ops as const.

Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Reviewed-by: Anisse Astier <anisse@astier.eu>
---
 drivers/platform/x86/msi-laptop.c    |    2 +-
 drivers/platform/x86/msi-wmi.c       |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index 759763d..1093ba2 100644
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -161,7 +161,7 @@ static int bl_update_status(struct backlight_device *b)
 	return set_lcd_level(b->props.brightness);
 }
 
-static struct backlight_ops msibl_ops = {
+static const struct backlight_ops msibl_ops = {
 	.get_brightness = bl_get_brightness,
 	.update_status  = bl_update_status,
 };
diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
index f5f70d4..5f7cff1 100644
--- a/drivers/platform/x86/msi-wmi.c
+++ b/drivers/platform/x86/msi-wmi.c
@@ -138,7 +138,7 @@ static int bl_set_status(struct backlight_device *bd)
 	return msi_wmi_set_block(0, backlight_map[bright]);
 }
 
-static struct backlight_ops msi_backlight_ops = {
+static const struct backlight_ops msi_backlight_ops = {
 	.get_brightness	= bl_get,
 	.update_status	= bl_set_status,
 };
@@ -251,8 +251,10 @@ static int __init msi_wmi_init(void)
 	if (!acpi_video_backlight_support()) {
 		backlight = backlight_device_register(DRV_NAME,
 				NULL, NULL, &msi_backlight_ops);
-		if (IS_ERR(backlight))
+		if (IS_ERR(backlight)) {
+			err = PTR_ERR(backlight);
 			goto err_free_input;
+		}
 
 		backlight->props.max_brightness = ARRAY_SIZE(backlight_map) - 1;
 		err = bl_get(NULL);
-- 
1.6.4.4


  parent reply	other threads:[~2010-02-26 12:21 UTC|newest]

Thread overview: 41+ 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
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
2010-02-24 16:00   ` [PATCH 1/3] picolcd: driver for PicoLCD HID device Bruno Prémont
2010-02-24 16:01     ` [PATCH 2/3] hid: add suspend/resume hooks for hid drivers Bruno Prémont
2010-02-25  4:19       ` Oliver Neukum
2010-02-25 10:12         ` Bruno Prémont
2010-02-24 16:01     ` [PATCH 3/3] hid-picolcd: make use of new suspend/resume hooks Bruno Prémont
2010-02-24 18:27     ` [PATCH 1/3] picolcd: driver for PicoLCD HID device Oliver Neukum
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
2010-02-25 11:07     ` Jiri Kosina
2010-02-25 11:32       ` Bruno Prémont
2010-02-25 15:18         ` Jiri Kosina
2010-02-25 15:29           ` Bruno Prémont
2010-03-13 19:39           ` Bruno Prémont
2010-03-13 21:35             ` Alan Stern
2010-03-13 22:13               ` [PATCH] hid: Register debugfs entries before adding device Bruno Prémont
2010-03-15 13:48                 ` Jiri Kosina
2010-02-25 17:52         ` [PATCH 1/3] picolcd: driver for PicoLCD HID device 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 handling Bruno Prémont
2010-02-21  8:04   ` Harald Welte
2010-02-21 13:35   ` Thadeu Lima de Souza Cascardo
2010-02-24 15:33     ` Anisse Astier
2010-02-26 11:59   ` [PATCH] backlight, classmate-laptop: fix missing " Bruno Prémont
2010-02-26 16:20     ` Thadeu Lima de Souza Cascardo
2010-02-26 16:32       ` Matthew Garrett
2010-02-26 16:45         ` Richard Purdie
2010-02-26 22:25           ` Bruno Prémont
2010-02-26 12:02   ` [PATCH] backlight, appledisplay: fix incomplete " Bruno Prémont
2010-02-26 12:04   ` [PATCH] backlight, blackfin: fix missing " Bruno Prémont
2010-02-26 12:17   ` Bruno Prémont [this message]
2010-02-26 12:20   ` [PATCH] backlight, panasonic-laptop: fix incomplete " Bruno Prémont

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=20100226131716.77d351ce@neptune.home \
    --to=bonbons@linux-vserver.org \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rpurdie@linux.intel.com \
    --cc=trenn@suse.de \
    /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

all inboxes | Powered by JetHome®