diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2013-02-21 16:44:04 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-28 06:32:25 -0800 |
| commit | 36c15fe81edd6963781d3472d27b199279f5d28a (patch) | |
| tree | b117a6e75148763cf691784968fc974010c53959 /drivers/video | |
| parent | 099f19c0426e465c44b66cc93f923461af6e5f8d (diff) | |
| download | kernel_samsung_smdk4412-36c15fe81edd6963781d3472d27b199279f5d28a.zip kernel_samsung_smdk4412-36c15fe81edd6963781d3472d27b199279f5d28a.tar.gz kernel_samsung_smdk4412-36c15fe81edd6963781d3472d27b199279f5d28a.tar.bz2 | |
drivers/video/backlight/adp88?0_bl.c: fix resume
commit 5eb02c01bd1f3ef195989ab05e835e2b0711b5a9 upstream.
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video')
| -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 d2a96a4..ee0f001 100644 --- a/drivers/video/backlight/adp8860_bl.c +++ b/drivers/video/backlight/adp8860_bl.c @@ -793,7 +793,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 05a8832..bc0503a 100644 --- a/drivers/video/backlight/adp8870_bl.c +++ b/drivers/video/backlight/adp8870_bl.c @@ -968,7 +968,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; } |