From 1f0540f70c8b485778799ce16a763260407a5771 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Mon, 14 Feb 2011 12:41:10 +0530 Subject: [PATCH] --- yaml --- r: 258709 b: refs/heads/master c: 1279ba5916f6635610c639186be84afaef831fb3 h: refs/heads/master i: 258707: 4d40d33f4fa87a3f1cee8104e7bcc7603f468cba v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/smartreflex.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ee4ee6a675f2..1f6af126affb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a89afa8cfb2cb614d0b8912f19ee98124feeb51 +refs/heads/master: 1279ba5916f6635610c639186be84afaef831fb3 diff --git a/trunk/arch/arm/mach-omap2/smartreflex.c b/trunk/arch/arm/mach-omap2/smartreflex.c index 3ee726143214..616ef62b3fa5 100644 --- a/trunk/arch/arm/mach-omap2/smartreflex.c +++ b/trunk/arch/arm/mach-omap2/smartreflex.c @@ -268,6 +268,7 @@ static int sr_late_init(struct omap_sr *sr_info) 0, name, (void *)sr_info); if (ret) goto error; + disable_irq(sr_info->irq); } if (pdata && pdata->enable_on_init)