Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
index 7fb4eefff80d..267d23f8d645 100644
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
@@ -98,23 +98,25 @@ static int hp680bl_get_intensity(struct backlight_device *bd)
         return current_intensity;
 }
 
-static struct backlight_ops hp680bl_ops = {
+static const struct backlight_ops hp680bl_ops = {
         .get_brightness = hp680bl_get_intensity,
         .update_status  = hp680bl_set_intensity,
 };
 
 static int __devinit hp680bl_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         struct backlight_device *bd;
 
-        bd = backlight_device_register ("hp680-bl", &pdev->dev, NULL,
-                    &hp680bl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = HP680_MAX_INTENSITY;
+        bd = backlight_device_register("hp680-bl", &pdev->dev, NULL,
+                                       &hp680bl_ops, &props);
         if (IS_ERR(bd))
                 return PTR_ERR(bd);
 
         platform_set_drvdata(pdev, bd);
 
-        bd->props.max_brightness = HP680_MAX_INTENSITY;
         bd->props.brightness = HP680_DEFAULT_INTENSITY;
         hp680bl_send_intensity(bd);