1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 789240d1b57..def4841183b 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -924,6 +924,7 @@ static int __init toshiba_acpi_init(void)
         u32 hci_result;
         bool bt_present;
         int ret = 0;
+        struct backlight_properties props;
 
         if (acpi_disabled)
                 return -ENODEV;
@@ -974,10 +975,12 @@ static int __init toshiba_acpi_init(void)
                 }
         }
 
+        props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
         toshiba_backlight_device = backlight_device_register("toshiba",
-                                                &toshiba_acpi.p_dev->dev,
-                                                NULL,
-                                                &toshiba_backlight_data);
+                                                             &toshiba_acpi.p_dev->dev,
+                                                             NULL,
+                                                             &toshiba_backlight_data,
+                                                             &props);
         if (IS_ERR(toshiba_backlight_device)) {
                 ret = PTR_ERR(toshiba_backlight_device);
 
@@ -986,7 +989,6 @@ static int __init toshiba_acpi_init(void)
                 toshiba_acpi_exit();
                 return ret;
         }
-        toshiba_backlight_device->props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
 
         /* Register rfkill switch for Bluetooth */
         if (hci_get_bt_present(&bt_present) == HCI_SUCCESS && bt_present) {