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>

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 5cbacf6e2bf79531417e4a8aae0cb931cc6048cd..ffa011f4677e12bf6ce6c17a4705b0090c6f98d2 100644 (file)
--- 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])