summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Prémont <bonbons@linux-vserver.org>2010-02-26 13:17:16 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-03-16 20:12:11 +0000
commit28d85873cd6d8d3176e30e02b941b1329df1024c (patch)
tree40be9e9db78823cfde9b5df0e18046ae0a67002a
parentfa11de0a33e214a00e205494c27fb5a7bb71a5fa (diff)
backlight: msi-laptop, msi-wmi: fix incomplete registration failure handling
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> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--drivers/platform/x86/msi-wmi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
index fb7ccaae656..367caaae2f3 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,
};
@@ -255,8 +255,10 @@ static int __init msi_wmi_init(void)
backlight = backlight_device_register(DRV_NAME, NULL, NULL,
&msi_backlight_ops,
&props);
- if (IS_ERR(backlight))
+ if (IS_ERR(backlight)) {
+ err = PTR_ERR(backlight);
goto err_free_input;
+ }
err = bl_get(NULL);
if (err < 0)