Merge tag 'for-3.9-rc1' of git://gitorious.org/linux-pwm/linux-pwm

Pull PWM changes from Thierry Reding:
 "A new driver has been added to support the PWM mode of the timer
  counter blocks found on Atmel AT91 SoCs.  The VT8500 driver now
  supports changing the PWM signal polarity and the TI drivers (EHRPWM
  and ECAP) gained suspend and resume functionality.

  User drivers can now query the core for whether access to a PWM device
  will sleep (if the PWM chip is on a slow bus such as I2C or SPI).

  The pwm-backlight driver now handles the backlight BL_CORE_FBBLANK
  state in addition to the FB layer's blanking states.

  To round things off, a few fixes and cleanups are also included"

* tag 'for-3.9-rc1' of git://gitorious.org/linux-pwm/linux-pwm:
  pwm: twl: Use to_twl() instead of container_of()
  pwm: tegra: assume CONFIG_OF
  pwm_backlight: Validate dft_brightness in main probe function
  pwm: Export pwm_{set,get}_chip_data()
  pwm: Make Kconfig entries more consistent
  pwm: Add can_sleep property to drivers
  pwm: Add pwm_can_sleep() as exported API to users
  pwm-backlight: handle BL_CORE_FBBLANK state
  pwm: pwm-tiecap: Low power sleep support
  pwm: pwm-tiehrpwm: Low power sleep support
  pwm: pwm-tiehrpwm: Update the clock handling of pwm-tiehrpwm driver
  pwm: vt8500: Add polarity support
  pwm: vt8500: Register write busy test performed incorrectly
  pwm: atmel: add Timer Counter Block PWM driver

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index f2f4c43d6e22..fa00304a63d8 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -41,10 +41,9 @@ static int pwm_backlight_update_status(struct backlight_device *bl)
         int brightness = bl->props.brightness;
         int max = bl->props.max_brightness;
 
-        if (bl->props.power != FB_BLANK_UNBLANK)
-                brightness = 0;
-
-        if (bl->props.fb_blank != FB_BLANK_UNBLANK)
+        if (bl->props.power != FB_BLANK_UNBLANK ||
+            bl->props.fb_blank != FB_BLANK_UNBLANK ||
+            bl->props.state & BL_CORE_FBBLANK)
                 brightness = 0;
 
         if (pb->notify)
@@ -135,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--;
         }
@@ -249,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);