diff options
| author | Hubert Feurstein <h.feurstein@gmail.com> | 2012-01-09 17:23:57 +0100 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-03-17 14:03:57 +0100 |
| commit | 297d4c0544c9db7bb1cb8a9797fe873855fcc8aa (patch) | |
| tree | a49b2f9dc6b3da488f26189bc740d9ecd53d1cff | |
| parent | 8c56853f92c1eb508c275373830e0ccefe1a7140 (diff) | |
| download | linux-stable-297d4c0544c9db7bb1cb8a9797fe873855fcc8aa.tar.gz linux-stable-297d4c0544c9db7bb1cb8a9797fe873855fcc8aa.tar.bz2 linux-stable-297d4c0544c9db7bb1cb8a9797fe873855fcc8aa.zip | |
atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume
commit 9f1065032ceb7e86c7c9f16bb86518857e88a172 upstream.
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>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | drivers/video/atmel_lcdfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 3105bdc86644..80b2f8792c99 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -1031,7 +1031,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); |