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)