On 01/09/2012 04:23 PM, Nicolas Ferre wrote: > From: Hubert Feurstein <h.feurstein@xxxxxxxxx> > > An error was existing in the saving of CONTRAST_CTR register > across suspend/resume. > > Signed-off-by: Hubert Feurstein <h.feurstein@xxxxxxxxx> > Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx> > Cc: stable <stable@xxxxxxxxxxxxxxx> 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); -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
