---

yaml --- r: 258709 b: refs/heads/master c: 1279ba5 h: refs/heads/master i: 258707: 4d40d33 v: v3
git-mirror · Jun 20, 2011 · 1f0540f · 1f0540f
1 parent e0b61f7
commit 1f0540f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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)