public inbox for linux-arm-kernel@lists.infradead.org 
 help / color / mirror / Atom feed
* [PATCH v2] atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume
       [not found] <1307350251-5767-1-git-send-email-h.feurstein@gmail.com>
@ 2012-01-09 16:23 ` Nicolas Ferre
  2012-01-09 16:46   ` Jean-Christophe PLAGNIOL-VILLARD
  2012-01-30  5:13   ` Florian Tobias Schandinat
  0 siblings, 2 replies; 3+ messages in thread
From: Nicolas Ferre @ 2012-01-09 16:23 UTC (permalink / raw)
  To: linux-arm-kernel

From: Hubert Feurstein <h.feurstein@gmail•com>

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>
Cc: stable <stable@vger•kernel.org>
---
 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 d7e3712..d99505b 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -1102,7 +1102,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);
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH v2] atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume
  2012-01-09 16:23 ` [PATCH v2] atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume Nicolas Ferre
@ 2012-01-09 16:46   ` Jean-Christophe PLAGNIOL-VILLARD
  2012-01-30  5:13   ` Florian Tobias Schandinat
  1 sibling, 0 replies; 3+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-01-09 16:46 UTC (permalink / raw)
  To: linux-arm-kernel

On 17:23 Mon 09 Jan     , Nicolas Ferre wrote:
> From: Hubert Feurstein <h.feurstein@gmail•com>
> 
> 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>
> Cc: stable <stable@vger•kernel.org>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft•com>

Best Regards,
J.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH v2] atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume
  2012-01-09 16:23 ` [PATCH v2] atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume Nicolas Ferre
  2012-01-09 16:46   ` Jean-Christophe PLAGNIOL-VILLARD
@ 2012-01-30  5:13   ` Florian Tobias Schandinat
  1 sibling, 0 replies; 3+ messages in thread
From: Florian Tobias Schandinat @ 2012-01-30  5:13 UTC (permalink / raw)
  To: linux-arm-kernel

On 01/09/2012 04:23 PM, Nicolas Ferre wrote:
> From: Hubert Feurstein <h.feurstein@gmail•com>
> 
> 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>
> Cc: stable <stable@vger•kernel.org>

Applied.


Thanks,

Florian Tobias Schandinat

> ---
>  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 d7e3712..d99505b 100644
> --- a/drivers/video/atmel_lcdfb.c
> +++ b/drivers/video/atmel_lcdfb.c
> @@ -1102,7 +1102,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);

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-01-30  5:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1307350251-5767-1-git-send-email-h.feurstein@gmail.com>
2012-01-09 16:23 ` [PATCH v2] atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume Nicolas Ferre
2012-01-09 16:46   ` Jean-Christophe PLAGNIOL-VILLARD
2012-01-30  5:13   ` Florian Tobias Schandinat

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox