diff --git a/[refs] b/[refs]
index ec160b55557b..ca45696bd691 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa11de0a33e214a00e205494c27fb5a7bb71a5fa
+refs/heads/master: 28d85873cd6d8d3176e30e02b941b1329df1024c
diff --git a/trunk/drivers/platform/x86/msi-wmi.c b/trunk/drivers/platform/x86/msi-wmi.c
index fb7ccaae6563..367caaae2f3c 100644
--- a/trunk/drivers/platform/x86/msi-wmi.c
+++ b/trunk/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)