diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2013-02-21 16:44:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 17:22:25 -0800 |
| commit | 5eb02c01bd1f3ef195989ab05e835e2b0711b5a9 (patch) | |
| tree | 80dc6c58fcd531b8dd9035040cb56ebeacc4968c | |
| parent | 5a429bdd6f1bedf401556de61c29117dd41fe3b1 (diff) | |
| download | linux-stable-5eb02c01bd1f3ef195989ab05e835e2b0711b5a9.tar.gz linux-stable-5eb02c01bd1f3ef195989ab05e835e2b0711b5a9.tar.bz2 linux-stable-5eb02c01bd1f3ef195989ab05e835e2b0711b5a9.zip | |
drivers/video/backlight/adp88?0_bl.c: fix resume
Clearing the NSTBY bit in the control register also automatically clears
the BLEN bit. So we need to make sure to set it again during resume,
otherwise the backlight will stay off.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/video/backlight/adp8860_bl.c | 2 | ||||
| -rw-r--r-- | drivers/video/backlight/adp8870_bl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c index 6bb72c0cb803..a77c9cad3320 100644 --- a/drivers/video/backlight/adp8860_bl.c +++ b/drivers/video/backlight/adp8860_bl.c @@ -783,7 +783,7 @@ static int adp8860_i2c_suspend(struct i2c_client *client, pm_message_t message) static int adp8860_i2c_resume(struct i2c_client *client) { - adp8860_set_bits(client, ADP8860_MDCR, NSTBY); + adp8860_set_bits(client, ADP8860_MDCR, NSTBY | BLEN); return 0; } diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c index 63c882b8177a..712c25a0d8fe 100644 --- a/drivers/video/backlight/adp8870_bl.c +++ b/drivers/video/backlight/adp8870_bl.c @@ -957,7 +957,7 @@ static int adp8870_i2c_suspend(struct i2c_client *client, pm_message_t message) static int adp8870_i2c_resume(struct i2c_client *client) { - adp8870_set_bits(client, ADP8870_MDCR, NSTBY); + adp8870_set_bits(client, ADP8870_MDCR, NSTBY | BLEN); return 0; } |