summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/arizona-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-09 00:45:53 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-09 00:45:53 +0200
commit3a36a0db5b0f77ff71a9df23db9f4044e04590d8 (patch)
tree2c681a5c6af9c6507959b4a5cfbc4dee6cffc7e3 /drivers/mfd/arizona-core.c
parentmfd: Add missing WM5102 ifdefs (diff)
downloadlinux-3a36a0db5b0f77ff71a9df23db9f4044e04590d8.tar.xz
linux-3a36a0db5b0f77ff71a9df23db9f4044e04590d8.zip
mfd: Don't free unallocated arizona supplies on error
ARRAY_SIZE() may be larger than the number of supplies actually used. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/arizona-core.c')
-rw-r--r--drivers/mfd/arizona-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 7f837edfbfb7..5cbacf6e2bf7 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -514,7 +514,7 @@ err_reset:
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);