aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2010-02-18 11:32:29 -0500
committerBen Dooks <ben-linux@fluff.org>2010-02-23 20:52:14 -0500
commita0af8b3c701d254b55fc291150d5320317c0a338 (patch)
tree617ee54e659bc2fdba3f2b9c1a4895502ebd451d
parent0fe1309b4db2a994d0b8347cea034cf58cb4b312 (diff)
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 <anarsoul@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--arch/arm/plat-samsung/adc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c
index 81caf2135721..0b5833b9ac5b 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)
412 con |= S3C2410_ADCCON_STDBM; 412 con |= S3C2410_ADCCON_STDBM;
413 writel(con, adc->regs + S3C2410_ADCCON); 413 writel(con, adc->regs + S3C2410_ADCCON);
414 414
415 disable_irq(adc->irq);
415 clk_disable(adc->clk); 416 clk_disable(adc->clk);
416 417
417 return 0; 418 return 0;
@@ -422,6 +423,7 @@ static int s3c_adc_resume(struct platform_device *pdev)
422 struct adc_device *adc = platform_get_drvdata(pdev); 423 struct adc_device *adc = platform_get_drvdata(pdev);
423 424
424 clk_enable(adc->clk); 425 clk_enable(adc->clk);
426 enable_irq(adc->irq);
425 427
426 writel(adc->prescale | S3C2410_ADCCON_PRSCEN, 428 writel(adc->prescale | S3C2410_ADCCON_PRSCEN,
427 adc->regs + S3C2410_ADCCON); 429 adc->regs + S3C2410_ADCCON);