3.16.74-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Brian Masney <masn...@onstation.org>

commit d3f48ec0954c6aac736ab21c34a35d7554409112 upstream.

lm3630a_bank_a_update_status() and lm3630a_bank_b_update_status()
both return the brightness value if the brightness was successfully
updated. Writing to these attributes via sysfs would cause a 'Bad
address' error to be returned. These functions should return 0 on
success, so let's change it to correct that error.

Fixes: 28e64a68a2ef ("backlight: lm3630: apply chip revision")
Signed-off-by: Brian Masney <masn...@onstation.org>
Acked-by: Pavel Machek <pa...@ucw.cz>
Acked-by: Daniel Thompson <daniel.thomp...@linaro.org>
Signed-off-by: Lee Jones <lee.jo...@linaro.org>
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 drivers/video/backlight/lm3630a_bl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/video/backlight/lm3630a_bl.c
+++ b/drivers/video/backlight/lm3630a_bl.c
@@ -201,7 +201,7 @@ static int lm3630a_bank_a_update_status(
                                      LM3630A_LEDA_ENABLE, LM3630A_LEDA_ENABLE);
        if (ret < 0)
                goto out_i2c_err;
-       return bl->props.brightness;
+       return 0;
 
 out_i2c_err:
        dev_err(pchip->dev, "i2c failed to access\n");
@@ -278,7 +278,7 @@ static int lm3630a_bank_b_update_status(
                                      LM3630A_LEDB_ENABLE, LM3630A_LEDB_ENABLE);
        if (ret < 0)
                goto out_i2c_err;
-       return bl->props.brightness;
+       return 0;
 
 out_i2c_err:
        dev_err(pchip->dev, "i2c failed to access REG_CTRL\n");

Reply via email to