diff --git a/[refs] b/[refs]
index 9a59bc43a91a..ff389fd7189f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b56daf13eb77ee24f48f0bb34c2492f46a432ec4
+refs/heads/master: d662fc82dc745ee24d518b0fde5a6a19758092ec
diff --git a/trunk/drivers/regulator/lp3971.c b/trunk/drivers/regulator/lp3971.c
index 7803a320543b..76d08c282f9c 100644
--- a/trunk/drivers/regulator/lp3971.c
+++ b/trunk/drivers/regulator/lp3971.c
@@ -446,8 +446,8 @@ static int setup_regulators(struct lp3971 *lp3971,
 		lp3971->rdev[i] = regulator_register(&regulators[id],
 			lp3971->dev, pdata->regulators[i].initdata, lp3971);
 
-		err = IS_ERR(lp3971->rdev[i]);
-		if (err) {
+		if (IS_ERR(lp3971->rdev[i])) {
+			err = PTR_ERR(lp3971->rdev[i]);
 			dev_err(lp3971->dev, "regulator init failed: %d\n",
 				err);
 			goto error;