From: Vasily Khoruzhick Date: Thu, 18 Feb 2010 16:32:29 +0000 (+0200) Subject: ARM: SAMSUNG: adc: disable/enable IRQ on suspend/resume X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=a0af8b3c701d254b55fc291150d5320317c0a338;p=linux-edison.git ARM: SAMSUNG: adc: disable/enable IRQ on suspend/resume IRQ should be disabled on suspend and re-enabled on resume. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks --- diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c index 81caf213572..0b5833b9ac5 100644 --- a/arch/arm/plat-samsung/adc.c +++ b/arch/arm/plat-samsung/adc.c @@ -412,6 +412,7 @@ static int s3c_adc_suspend(struct platform_device *pdev, pm_message_t state) con |= S3C2410_ADCCON_STDBM; writel(con, adc->regs + S3C2410_ADCCON); + disable_irq(adc->irq); clk_disable(adc->clk); return 0; @@ -422,6 +423,7 @@ static int s3c_adc_resume(struct platform_device *pdev) struct adc_device *adc = platform_get_drvdata(pdev); clk_enable(adc->clk); + enable_irq(adc->irq); writel(adc->prescale | S3C2410_ADCCON_PRSCEN, adc->regs + S3C2410_ADCCON);