Updated from Linux LTS 3.10.21 to 3.10.22
This commit is contained in:
@@ -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)
|
||||
@@ -207,8 +207,10 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct atmel_pwm_bl *pwmbl = platform_get_drvdata(pdev);
|
||||
|
||||
if (pwmbl->gpio_on != -1)
|
||||
gpio_set_value(pwmbl->gpio_on, 0);
|
||||
if (pwmbl->gpio_on != -1) {
|
||||
gpio_set_value(pwmbl->gpio_on,
|
||||
0 ^ pwmbl->pdata->on_active_low);
|
||||
}
|
||||
pwm_channel_disable(&pwmbl->pwmc);
|
||||
pwm_channel_free(&pwmbl->pwmc);
|
||||
backlight_device_unregister(pwmbl->bldev);
|
||||
|
||||
Reference in New Issue
Block a user