---

yaml --- r: 323362 b: refs/heads/master c: 86b3fef h: refs/heads/master v: v3
git-mirror · Sep 5, 2012 · 82e4310 · 82e4310
1 parent f13b82b
commit 82e4310
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b158fba605bf4f1c97af338dfab64c85c4937513
+refs/heads/master: 86b3fef0c7b5aba1c64ac1e02e68267aeaff44a6
diff --git a/trunk/drivers/regulator/lp872x.c b/trunk/drivers/regulator/lp872x.c
@@ -796,13 +796,14 @@ static int lp872x_config(struct lp872x *lp)
 	struct lp872x_platform_data *pdata = lp->pdata;
 	int ret;
 
-	if (!pdata->update_config)
-		return 0;
+	if (!pdata || !pdata->update_config)
+		goto init_dvs;
 
 	ret = lp872x_write_byte(lp, LP872X_GENERAL_CFG, pdata->general_config);
 	if (ret)
 		return ret;
 
+init_dvs:
 	return lp872x_init_dvs(lp);
 }