From 9113a2996da8a744eeacdfcaf9e00400c8001a73 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 26 Sep 2012 18:00:28 +0100 Subject: [PATCH] --- yaml --- r: 330011 b: refs/heads/master c: 46ae368bfc526a53ce9e516e3af051b2d7a7c24d h: refs/heads/master i: 330009: 6fd42c1a751d9cca6cd3f14c9659c52c49a4da43 330007: 1c0fc643077c1450cbbf41eef1a0af91336008e6 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/arizona-irq.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b8f252bd9728..d283f3a1a8ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 396f70be54f026a6601012a73db87dc75c6d8f1d +refs/heads/master: 46ae368bfc526a53ce9e516e3af051b2d7a7c24d diff --git a/trunk/drivers/mfd/arizona-irq.c b/trunk/drivers/mfd/arizona-irq.c index f7886c8269bc..ef0f2d001df2 100644 --- a/trunk/drivers/mfd/arizona-irq.c +++ b/trunk/drivers/mfd/arizona-irq.c @@ -192,6 +192,7 @@ int arizona_irq_init(struct arizona *arizona) switch (arizona->rev) { case 0: + case 1: ctrlif_error = false; break; default: