diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-09 12:56:43 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-07-09 15:16:29 +0200 |
| commit | af65a361d543100962c03cc4cdb7333b14c9d119 (patch) | |
| tree | dfaa33bc0f9f418b46d0771b27ef702cce210f2d /drivers | |
| parent | mfd: 88pm80[05] i2c device_id arrays should be NULL terminated (diff) | |
| download | linux-af65a361d543100962c03cc4cdb7333b14c9d119.tar.xz linux-af65a361d543100962c03cc4cdb7333b14c9d119.zip | |
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')
| -rw-r--r-- | drivers/mfd/arizona-core.c | 6 |
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]) |