From 82e43103f36c7a959565f7121719eaa04d5d54bd Mon Sep 17 00:00:00 2001 From: "Kim, Milo" Date: Wed, 5 Sep 2012 04:39:23 +0000 Subject: [PATCH] --- yaml --- r: 323362 b: refs/heads/master c: 86b3fef0c7b5aba1c64ac1e02e68267aeaff44a6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/lp872x.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 93a47a6c362d..3ab95d645d5e 100644 --- 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 index d86b6a3e750d..b16a941c1a62 100644 --- 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); }