Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f3821c3 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

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



[ 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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 84d84143

drivers/video/backlight/lm3630a_bl.c

+6 −6
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static int lm3630a_bank_a_update_status(struct backlight_device *bl) 
	if ((pwm_ctrl & LM3630A_PWM_BANK_A) != 0) {

		lm3630a_pwm_ctrl(pchip, bl->props.brightness,

				 bl->props.max_brightness);

		return bl->props.brightness;

		return 0;

	}



	/* disable sleep */
@@ -208,8 +208,8 @@ static int lm3630a_bank_a_update_status(struct backlight_device *bl) 
	return 0;



out_i2c_err:

	dev_err(pchip->dev, "i2c failed to access\n");

	return bl->props.brightness;

	dev_err(pchip->dev, "i2c failed to access (%pe)\n", ERR_PTR(ret));

	return ret;

}



static int lm3630a_bank_a_get_brightness(struct backlight_device *bl)
@@ -265,7 +265,7 @@ static int lm3630a_bank_b_update_status(struct backlight_device *bl) 
	if ((pwm_ctrl & LM3630A_PWM_BANK_B) != 0) {

		lm3630a_pwm_ctrl(pchip, bl->props.brightness,

				 bl->props.max_brightness);

		return bl->props.brightness;

		return 0;

	}



	/* disable sleep */
@@ -285,8 +285,8 @@ static int lm3630a_bank_b_update_status(struct backlight_device *bl) 
	return 0;



out_i2c_err:

	dev_err(pchip->dev, "i2c failed to access REG_CTRL\n");

	return bl->props.brightness;

	dev_err(pchip->dev, "i2c failed to access (%pe)\n", ERR_PTR(ret));

	return ret;

}



static int lm3630a_bank_b_get_brightness(struct backlight_device *bl)