summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-05 20:35:30 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-09 00:39:07 +0200
commitcfe775ce62d83168125299714739aebc1018211e (patch)
treedf4bc25d18a45f9a69c38b5a68b150091ba7abff /drivers
parent5879f5710e684af662635770561112ce3f25ea8c (diff)
downloadlinux-stable-cfe775ce62d83168125299714739aebc1018211e.tar.gz
linux-stable-cfe775ce62d83168125299714739aebc1018211e.tar.bz2
linux-stable-cfe775ce62d83168125299714739aebc1018211e.zip
mfd: Treat arizona register read errors as non-fatal during resume
We're testing for a specific value and while SPI does not detect I/O errors I2C can. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index e1308b5214ba..03aef6750a9d 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -197,7 +197,7 @@ static int arizona_wait_for_boot(struct arizona *arizona)
if (ret != 0) {
dev_err(arizona->dev, "Failed to read boot state: %d\n",
ret);
- return ret;
+ continue;
}
if (reg & ARIZONA_BOOT_DONE_STS)