aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2014-06-02 04:50:42 -0400
committerLee Jones <lee.jones@linaro.org>2014-07-09 09:58:04 -0400
commit4420286e047e087f5879a1c652653808b32717db (patch)
treecfef157f898cd38c9205ee7af94bfdfa1981b2b6
parente6021511f11e71d0e77e5c31f5b0722a80c3545c (diff)
mfd: arizona: Use num_core_supplies in arizona_dev_exit
Currently we call regulator_bulk_disable with ARRAY_SIZE(arizona->core_supplies), however this array may be larger than the number of supplies actually used by the chip we are dealing with. Use the provided num_core_supplies member instead, so that we only disable supplies which actually exist. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-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 fee6a1ee3a0f..27936fe89434 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -1038,7 +1038,7 @@ int arizona_dev_exit(struct arizona *arizona)
1038 if (arizona->pdata.reset) 1038 if (arizona->pdata.reset)
1039 gpio_set_value_cansleep(arizona->pdata.reset, 0); 1039 gpio_set_value_cansleep(arizona->pdata.reset, 0);
1040 1040
1041 regulator_bulk_disable(ARRAY_SIZE(arizona->core_supplies), 1041 regulator_bulk_disable(arizona->num_core_supplies,
1042 arizona->core_supplies); 1042 arizona->core_supplies);
1043 return 0; 1043 return 0;
1044} 1044}