aboutsummaryrefslogtreecommitdiff
path: root/drivers/mfd/arizona-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-09 11:56:43 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-09 15:16:29 +0200
commitaf65a361d543100962c03cc4cdb7333b14c9d119 (patch)
treedfaa33bc0f9f418b46d0771b27ef702cce210f2d /drivers/mfd/arizona-core.c
parent31b3ffbdfb4e4d2d2416c30fe02da3e58e37d798 (diff)
mfd: Error out if initial arizona boot fails
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.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 5cbacf6e2bf7..ffa011f4677e 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -398,7 +398,11 @@ int __devinit arizona_dev_init(struct arizona *arizona)
}
}
- arizona_wait_for_boot(arizona);
+ ret = arizona_wait_for_boot(arizona);
+ if (ret != 0) {
+ dev_err(arizona->dev, "Device failed initial boot: %d\n", ret);
+ goto err_reset;
+ }
for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) {
if (!arizona->pdata.gpio_defaults[i])