From baded2fe5effbb1102366b3da55a3a0fa7634482 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 9 Jul 2012 00:45:53 +0200
Subject: [PATCH] --- yaml --- r: 319744 b: refs/heads/master c:
 3a36a0db5b0f77ff71a9df23db9f4044e04590d8 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mfd/arizona-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7baf12c70681..0c1fde26c4ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 863df8d5f1a1a92016e24c80947cb3509b8aaa48
+refs/heads/master: 3a36a0db5b0f77ff71a9df23db9f4044e04590d8
diff --git a/trunk/drivers/mfd/arizona-core.c b/trunk/drivers/mfd/arizona-core.c
index 7f837edfbfb7..5cbacf6e2bf7 100644
--- a/trunk/drivers/mfd/arizona-core.c
+++ b/trunk/drivers/mfd/arizona-core.c
@@ -514,7 +514,7 @@ int __devinit arizona_dev_init(struct arizona *arizona)
 err_dcvdd:
 	regulator_disable(arizona->dcvdd);
 err_enable:
-	regulator_bulk_disable(ARRAY_SIZE(arizona->core_supplies),
+	regulator_bulk_disable(arizona->num_core_supplies,
 			       arizona->core_supplies);
 err_early:
 	mfd_remove_devices(dev);