From 1efb7f456a32d0f65e219f7ed4c6e0096d073e3e Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Thu, 18 Feb 2010 18:32:29 +0200 Subject: [PATCH] --- yaml --- r: 187678 b: refs/heads/master c: a0af8b3c701d254b55fc291150d5320317c0a338 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-samsung/adc.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ea19759e6d75..3e4224c745c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fe1309b4db2a994d0b8347cea034cf58cb4b312 +refs/heads/master: a0af8b3c701d254b55fc291150d5320317c0a338 diff --git a/trunk/arch/arm/plat-samsung/adc.c b/trunk/arch/arm/plat-samsung/adc.c index 81caf2135721..0b5833b9ac5b 100644 --- a/trunk/arch/arm/plat-samsung/adc.c +++ b/trunk/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);