From b76ec7ec1e51429c6c5df80b8545f518f9ff4859 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 18 Jul 2012 12:33:20 +0800 Subject: [PATCH] --- yaml --- r: 321849 b: refs/heads/master c: 1c9d2d71a3cb0fcbfe91307b3c18d22f7d93f0cd h: refs/heads/master i: 321847: b5c01470d46baeb698498391df520418472b3446 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/palmas-regulator.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f60f151b5fdf..ef906f7aa5bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2735daeb161d3eb1ba041158c21ac2a0e42da6a2 +refs/heads/master: 1c9d2d71a3cb0fcbfe91307b3c18d22f7d93f0cd diff --git a/trunk/drivers/regulator/palmas-regulator.c b/trunk/drivers/regulator/palmas-regulator.c index de68347cbc69..46c7e88f8381 100644 --- a/trunk/drivers/regulator/palmas-regulator.c +++ b/trunk/drivers/regulator/palmas-regulator.c @@ -633,7 +633,7 @@ static __devinit int palmas_probe(struct platform_device *pdev) ret = palmas_smps_read(palmas, PALMAS_SMPS_CTRL, ®); if (ret) - goto err_unregister_regulator; + return ret; if (reg & PALMAS_SMPS_CTRL_SMPS12_SMPS123_EN) pmic->smps123 = 1; @@ -783,8 +783,10 @@ static __devinit int palmas_probe(struct platform_device *pdev) reg_init = pdata->reg_init[id]; if (reg_init) { ret = palmas_ldo_init(palmas, id, reg_init); - if (ret) + if (ret) { + regulator_unregister(pmic->rdev[id]); goto err_unregister_regulator; + } } } }