aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/ibm_acpi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/ibm_acpi.c')
-rw-r--r--drivers/acpi/ibm_acpi.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 1e7abef404b0..130cc8c37e22 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -1714,7 +1714,7 @@ static struct backlight_properties ibm_backlight_data = {
1714 1714
1715static int brightness_init(void) 1715static int brightness_init(void)
1716{ 1716{
1717 ibm_backlight_device = backlight_device_register("ibm", NULL, 1717 ibm_backlight_device = backlight_device_register("ibm", NULL, NULL,
1718 &ibm_backlight_data); 1718 &ibm_backlight_data);
1719 if (IS_ERR(ibm_backlight_device)) { 1719 if (IS_ERR(ibm_backlight_device)) {
1720 printk(IBM_ERR "Could not register backlight device\n"); 1720 printk(IBM_ERR "Could not register backlight device\n");
@@ -2503,7 +2503,7 @@ static int __init setup_notify(struct ibm_struct *ibm)
2503 ibm->name, status); 2503 ibm->name, status);
2504 return -ENODEV; 2504 return -ENODEV;
2505 } 2505 }
2506 2506 ibm->notify_installed = 1;
2507 return 0; 2507 return 0;
2508} 2508}
2509 2509
@@ -2580,7 +2580,6 @@ static int __init ibm_init(struct ibm_struct *ibm)
2580 ret = setup_notify(ibm); 2580 ret = setup_notify(ibm);
2581 if (ret < 0) 2581 if (ret < 0)
2582 return ret; 2582 return ret;
2583 ibm->notify_installed = 1;
2584 } 2583 }
2585 2584
2586 return 0; 2585 return 0;