Commit 28d85873 authored by Bruno Prémont's avatar Bruno Prémont Committed by Richard Purdie

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: default avatarBruno Prémont <bonbons@linux-vserver.org>
Reviewed-by: default avatarAnisse Astier <anisse@astier.eu>
Signed-off-by: default avatarRichard Purdie <rpurdie@linux.intel.com>
parent fa11de0a
...@@ -138,7 +138,7 @@ static int bl_set_status(struct backlight_device *bd) ...@@ -138,7 +138,7 @@ static int bl_set_status(struct backlight_device *bd)
return msi_wmi_set_block(0, backlight_map[bright]); 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, .get_brightness = bl_get,
.update_status = bl_set_status, .update_status = bl_set_status,
}; };
...@@ -255,8 +255,10 @@ static int __init msi_wmi_init(void) ...@@ -255,8 +255,10 @@ static int __init msi_wmi_init(void)
backlight = backlight_device_register(DRV_NAME, NULL, NULL, backlight = backlight_device_register(DRV_NAME, NULL, NULL,
&msi_backlight_ops, &msi_backlight_ops,
&props); &props);
if (IS_ERR(backlight)) if (IS_ERR(backlight)) {
err = PTR_ERR(backlight);
goto err_free_input; goto err_free_input;
}
err = bl_get(NULL); err = bl_get(NULL);
if (err < 0) if (err < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment