Merge commit 'kumar/merge' into merge

[pandora-kernel.git] / arch / arm / plat-samsung / adc.c

diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c
index 81caf21..0b5833b 100644 (file)
--- 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);