aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/backlight/adp8870_bl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/backlight/adp8870_bl.c')
-rw-r--r--drivers/video/backlight/adp8870_bl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
index 251af4d38d86..037e43083343 100644
--- a/drivers/video/backlight/adp8870_bl.c
+++ b/drivers/video/backlight/adp8870_bl.c
@@ -144,6 +144,7 @@ static int adp8870_read(struct i2c_client *client, int reg, uint8_t *val)
144static int adp8870_write(struct i2c_client *client, u8 reg, u8 val) 144static int adp8870_write(struct i2c_client *client, u8 reg, u8 val)
145{ 145{
146 int ret = i2c_smbus_write_byte_data(client, reg, val); 146 int ret = i2c_smbus_write_byte_data(client, reg, val);
147
147 if (ret) 148 if (ret)
148 dev_err(&client->dev, "failed to write\n"); 149 dev_err(&client->dev, "failed to write\n");
149 150
@@ -195,6 +196,7 @@ static int adp8870_clr_bits(struct i2c_client *client, int reg, uint8_t bit_mask
195static void adp8870_led_work(struct work_struct *work) 196static void adp8870_led_work(struct work_struct *work)
196{ 197{
197 struct adp8870_led *led = container_of(work, struct adp8870_led, work); 198 struct adp8870_led *led = container_of(work, struct adp8870_led, work);
199
198 adp8870_write(led->client, ADP8870_ISC1 + led->id - 1, 200 adp8870_write(led->client, ADP8870_ISC1 + led->id - 1,
199 led->new_brightness >> 1); 201 led->new_brightness >> 1);
200} 202}
@@ -399,6 +401,7 @@ static int adp8870_bl_set(struct backlight_device *bl, int brightness)
399static int adp8870_bl_update_status(struct backlight_device *bl) 401static int adp8870_bl_update_status(struct backlight_device *bl)
400{ 402{
401 int brightness = bl->props.brightness; 403 int brightness = bl->props.brightness;
404
402 if (bl->props.power != FB_BLANK_UNBLANK) 405 if (bl->props.power != FB_BLANK_UNBLANK)
403 brightness = 0; 406 brightness = 0;
404 407
@@ -649,6 +652,7 @@ static ssize_t adp8870_bl_l1_daylight_max_store(struct device *dev,
649{ 652{
650 struct adp8870_bl *data = dev_get_drvdata(dev); 653 struct adp8870_bl *data = dev_get_drvdata(dev);
651 int ret = kstrtoul(buf, 10, &data->cached_daylight_max); 654 int ret = kstrtoul(buf, 10, &data->cached_daylight_max);
655
652 if (ret) 656 if (ret)
653 return ret; 657 return ret;
654 658