Skip to content

Commit

Permalink
drivers/video/backlight/adp88?0_bl.c: fix resume
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
larsclausen authored and torvalds committed Feb 22, 2013
1 parent 5a429bd commit 5eb02c0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/video/backlight/adp8860_bl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/backlight/adp8870_bl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 5eb02c0

Please sign in to comment.