From: Bruno Prémont Date: Fri, 26 Feb 2010 12:17:16 +0000 (+0100) Subject: backlight: msi-laptop, msi-wmi: fix incomplete registration failure handling X-Git-Tag: v2.6.34-rc2~25^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28d85873cd6d8d3176e30e02b941b1329df1024c;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git 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 Reviewed-by: Anisse Astier Signed-off-by: Richard Purdie --- diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c index fb7ccaa..367caaa 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)