[12/21] atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-02-10 22:51:50
Also in:
lkml
2.6.32-longterm review patch. If anyone has any objections, please let me know. ------------------ From: Hubert Feurstein <redacted> commit 9f1065032ceb7e86c7c9f16bb86518857e88a172 upstream. An error was existing in the saving of CONTRAST_CTR register across suspend/resume. Signed-off-by: Hubert Feurstein <redacted> Signed-off-by: Nicolas Ferre <redacted> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <redacted> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/video/atmel_lcdfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c@@ -1052,7 +1052,7 @@ static int atmel_lcdfb_suspend(struct pl */ 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);