Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / drivers / misc / msi-laptop.c

diff --git a/drivers/misc/msi-laptop.c b/drivers/misc/msi-laptop.c
index fdb7153..68c4b58 100644 (file)
--- a/drivers/misc/msi-laptop.c
+++ b/drivers/misc/msi-laptop.c
@@ -157,14 +157,12 @@ static int bl_get_brightness(struct backlight_device *b)
 
 static int bl_update_status(struct backlight_device *b)
 {
-       return set_lcd_level(b->props->brightness);
+       return set_lcd_level(b->props.brightness);
 }
 
-static struct backlight_properties msibl_props = {
-       .owner          = THIS_MODULE,
+static struct backlight_ops msibl_ops = {
        .get_brightness = bl_get_brightness,
        .update_status  = bl_update_status,
-       .max_brightness = MSI_LCD_LEVEL_MAX-1,
 };
 
 static struct backlight_device *msibl_device;
@@ -317,10 +315,13 @@ static int __init msi_init(void)
 
        /* Register backlight stuff */
 
-       msibl_device = backlight_device_register("msi-laptop-bl", NULL, &msibl_props);
+       msibl_device = backlight_device_register("msi-laptop-bl", NULL, NULL,
+                                               &msibl_ops);
        if (IS_ERR(msibl_device))
                return PTR_ERR(msibl_device);
 
+       msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1,
+
        ret = platform_driver_register(&msipf_driver);
        if (ret)
                goto fail_backlight;