---

yaml --- r: 349305 b: refs/heads/master c: 9270bdf h: refs/heads/master i: 349303: c89adc3 v: v3
git-mirror · Jan 22, 2013 · f35f2d6 · f35f2d6
1 parent c23df39
commit f35f2d6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f0529b4d80ad02df637be67ed4f82e93b8db32f
+refs/heads/master: 9270bdf5405668ca5d75ace1d7872e2762162c47
diff --git a/trunk/drivers/mfd/arizona-core.c b/trunk/drivers/mfd/arizona-core.c
@@ -239,7 +239,12 @@ static int arizona_runtime_resume(struct device *dev)
 		return ret;
 	}
 
-	regcache_sync(arizona->regmap);
+	ret = regcache_sync(arizona->regmap);
+	if (ret != 0) {
+		dev_err(arizona->dev, "Failed to restore register cache\n");
+		regulator_disable(arizona->dcvdd);
+		return ret;
+	}
 
 	return 0;
 }