AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

backlight: lm3630a: Fix return code of .update_status() callback

Browse Source 
[ Upstream commit b9481a667a90ec739995e85f91f3672ca44d6ffa ]

According to <linux/backlight.h> .update_status() is supposed to
return 0 on success and a negative error code otherwise. Adapt
lm3630a_bank_a_update_status() and lm3630a_bank_b_update_status() to
actually do it.

While touching that also add the error code to the failure message.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Uwe Kleine-König 2021-06-21 14:21:47 +02:00 committed by Greg Kroah-Hartman
parent 719c45a41c
commit 63c49cfa2f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/video/backlight/lm3630a_bl.c
View File

@ -190,7 +190,7 @@ static int lm3630a_bank_a_update_status(struct backlight_device *bl)
if ((pwm_ctrl & LM3630A_PWM_BANK_A) != 0) { if ((pwm_ctrl & LM3630A_PWM_BANK_A) != 0) {
lm3630a_pwm_ctrl(pchip, bl->props.brightness, lm3630a_pwm_ctrl(pchip, bl->props.brightness,
bl->props.max_brightness); bl->props.max_brightness);
return bl->props.brightness; return 0;
} }
/* disable sleep */ /* disable sleep */
@ -210,8 +210,8 @@ static int lm3630a_bank_a_update_status(struct backlight_device *bl)
return 0; return 0;
out_i2c_err: out_i2c_err:
dev_err(pchip->dev, "i2c failed to access\n"); dev_err(pchip->dev, "i2c failed to access (%pe)\n", ERR_PTR(ret));
return bl->props.brightness; return ret;
} }
static int lm3630a_bank_a_get_brightness(struct backlight_device *bl) static int lm3630a_bank_a_get_brightness(struct backlight_device *bl)
@ -267,7 +267,7 @@ static int lm3630a_bank_b_update_status(struct backlight_device *bl)
if ((pwm_ctrl & LM3630A_PWM_BANK_B) != 0) { if ((pwm_ctrl & LM3630A_PWM_BANK_B) != 0) {
lm3630a_pwm_ctrl(pchip, bl->props.brightness, lm3630a_pwm_ctrl(pchip, bl->props.brightness,
bl->props.max_brightness); bl->props.max_brightness);
return bl->props.brightness; return 0;
} }
/* disable sleep */ /* disable sleep */
@ -287,8 +287,8 @@ static int lm3630a_bank_b_update_status(struct backlight_device *bl)
return 0; return 0;
out_i2c_err: out_i2c_err:
dev_err(pchip->dev, "i2c failed to access REG_CTRL\n"); dev_err(pchip->dev, "i2c failed to access (%pe)\n", ERR_PTR(ret));
return bl->props.brightness; return ret;
} }
static int lm3630a_bank_b_get_brightness(struct backlight_device *bl) static int lm3630a_bank_b_get_brightness(struct backlight_device *bl)