summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHubert Feurstein <h.feurstein@gmail.com>2012-01-09 17:23:57 +0100
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-01-28 19:50:22 +0000
commit9f1065032ceb7e86c7c9f16bb86518857e88a172 (patch)
tree2a3f7982c0b0d8fa1ee745a784b091530a209719
parent7bc1dc7174d06104fde069a3b5aef1c5b902a5c9 (diff)
downloadop-kernel-dev-9f1065032ceb7e86c7c9f16bb86518857e88a172.zip
op-kernel-dev-9f1065032ceb7e86c7c9f16bb86518857e88a172.tar.gz
atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume
An error was existing in the saving of CONTRAST_CTR register across suspend/resume. Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
-rw-r--r--drivers/video/atmel_lcdfb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 0d7b20d..e40c00f 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -1108,7 +1108,7 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)
*/
lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL);
- sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
+ sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_CTR);
lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0);
if (sinfo->atmel_lcdfb_power_control)
sinfo->atmel_lcdfb_power_control(0);
OpenPOWER on IntegriCloud