pwm_backlight: Validate dft_brightness in main probe function
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Tue, 22 Jan 2013 13:39:54 +0000 (14:39 +0100)
committerThierry Reding <thierry.reding@avionic-design.de>
Thu, 31 Jan 2013 12:47:51 +0000 (13:47 +0100)
Move the dft_brightness validity check from the DT parsing function to the
main probe. In this way we can validate it in case we are booting with or
without DT.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
drivers/video/backlight/pwm_bl.c

index 4af6d13..a71ef4a 100644 (file)
@@ -134,12 +134,6 @@ static int pwm_backlight_parse_dt(struct device *dev,
                if (ret < 0)
                        return ret;
 
-               if (value >= data->max_brightness) {
-                       dev_warn(dev, "invalid default brightness level: %u, using %u\n",
-                                value, data->max_brightness - 1);
-                       value = data->max_brightness - 1;
-               }
-
                data->dft_brightness = value;
                data->max_brightness--;
        }
@@ -248,6 +242,13 @@ static int pwm_backlight_probe(struct platform_device *pdev)
                goto err_alloc;
        }
 
+       if (data->dft_brightness > data->max_brightness) {
+               dev_warn(&pdev->dev,
+                        "invalid default brightness level: %u, using %u\n",
+                        data->dft_brightness, data->max_brightness);
+               data->dft_brightness = data->max_brightness;
+       }
+
        bl->props.brightness = data->dft_brightness;
        backlight_update_status(bl);