diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-08-11 20:06:51 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-08-11 20:07:01 -0700 |
| commit | 79fdad2d47fe1a165b56b3066692d58340b4a4e7 (patch) | |
| tree | aaae4a80b542e6ff9bdb459cfd5cd467012606a3 /drivers/leds/leds-lm3530.c | |
| parent | 828496eb80e97b7dbd4921ad64b1799ba2e5dd5b (diff) | |
| parent | a98de0fc91c3eadbc5485a90cae619b869974ccf (diff) | |
| download | olio-linux-3.10-79fdad2d47fe1a165b56b3066692d58340b4a4e7.tar.xz olio-linux-3.10-79fdad2d47fe1a165b56b3066692d58340b4a4e7.zip | |
Merge branch 'android-3.10-bringup' of ssh://internal.oliodevices.com:29418/kernel/omap into android-3.10-bringup
Change-Id: Ic0a04e74a94fa6a7ee1769a9bee71117961238b4
Diffstat (limited to 'drivers/leds/leds-lm3530.c')
| -rw-r--r-- | drivers/leds/leds-lm3530.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c index c3d4a69655f..fda0efb4f88 100644 --- a/drivers/leds/leds-lm3530.c +++ b/drivers/leds/leds-lm3530.c @@ -324,8 +324,6 @@ static void lm3530_brightness_set(struct led_classdev *led_cdev, switch (drvdata->mode) { case LM3530_BL_MODE_MANUAL: - case LM3530_BL_MODE_SIMPLE_MANUAL: - if (!drvdata->enable) { err = lm3530_init_registers(drvdata); if (err) { @@ -334,6 +332,7 @@ static void lm3530_brightness_set(struct led_classdev *led_cdev, break; } } + case LM3530_BL_MODE_SIMPLE_MANUAL: /* set the brightness in brightness control register*/ err = i2c_smbus_write_byte_data(drvdata->client, |