backlight: atmel-pwm-bl: fix reported brightness
authorJohan Hovold <jhovold@gmail.com>
Tue, 12 Nov 2013 23:09:38 +0000 (15:09 -0800)
committerBen Hutchings <ben@decadent.org.uk>
Fri, 3 Jan 2014 04:33:21 +0000 (04:33 +0000)
commit 185d91442550110db67a7dc794a32efcea455a36 upstream.

The driver supports 16-bit brightness values, but the value returned
from get_brightness was truncated to eight bits.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/video/backlight/atmel-pwm-bl.c

index 0443a4f..4d2bbd8 100644 (file)
@@ -70,7 +70,7 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)
 static int atmel_pwm_bl_get_intensity(struct backlight_device *bd)
 {
        struct atmel_pwm_bl *pwmbl = bl_get_data(bd);
-       u8 intensity;
+       u32 intensity;
 
        if (pwmbl->pdata->pwm_active_low) {
                intensity = pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY) -
@@ -80,7 +80,7 @@ static int atmel_pwm_bl_get_intensity(struct backlight_device *bd)
                        pwm_channel_readl(&pwmbl->pwmc, PWM_CDTY);
        }
 
-       return intensity;
+       return intensity & 0xffff;
 }
 
 static int atmel_pwm_bl_init_pwm(struct atmel_pwm_bl *pwmbl)