1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index c64e3528889b..63290b33c879 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -58,6 +58,7 @@
 #include <linux/kthread.h>
 #include <linux/freezer.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include <linux/nvram.h>
 #include <linux/proc_fs.h>
@@ -6170,6 +6171,7 @@ static const struct tpacpi_quirk brightness_quirk_table[] __initconst = {
 
 static int __init brightness_init(struct ibm_init_struct *iibm)
 {
+        struct backlight_properties props;
         int b;
         unsigned long quirks;
 
@@ -6259,9 +6261,12 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
                 printk(TPACPI_INFO
                        "detected a 16-level brightness capable ThinkPad\n");
 
-        ibm_backlight_device = backlight_device_register(
-                                        TPACPI_BACKLIGHT_DEV_NAME, NULL, NULL,
-                                        &ibm_backlight_data);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = (tp_features.bright_16levels) ? 15 : 7;
+        ibm_backlight_device = backlight_device_register(TPACPI_BACKLIGHT_DEV_NAME,
+                                                         NULL, NULL,
+                                                         &ibm_backlight_data,
+                                                         &props);
         if (IS_ERR(ibm_backlight_device)) {
                 int rc = PTR_ERR(ibm_backlight_device);
                 ibm_backlight_device = NULL;
@@ -6280,8 +6285,6 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
                         "or not on your ThinkPad\n", TPACPI_MAIL);
         }
 
-        ibm_backlight_device->props.max_brightness =
-                                (tp_features.bright_16levels)? 15 : 7;
         ibm_backlight_device->props.brightness = b & TP_EC_BACKLIGHT_LVLMSK;
         backlight_update_status(ibm_backlight_device);