diff --git a/[refs] b/[refs]
index 1a4efbc474ad..c986e908e46a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fff6c04d81a2852821135736fad2d8386464753
+refs/heads/master: 67e46f347eb25222e2b415540b6ba3fd2574afe2
diff --git a/trunk/drivers/regulator/lp3971.c b/trunk/drivers/regulator/lp3971.c
index f5532ed79272..55fab4a30645 100644
--- a/trunk/drivers/regulator/lp3971.c
+++ b/trunk/drivers/regulator/lp3971.c
@@ -439,6 +439,10 @@ static int __devinit setup_regulators(struct lp3971 *lp3971,
 	lp3971->num_regulators = pdata->num_regulators;
 	lp3971->rdev = kcalloc(pdata->num_regulators,
 				sizeof(struct regulator_dev *), GFP_KERNEL);
+	if (!lp3971->rdev) {
+		err = -ENOMEM;
+		goto err_nomem;
+	}
 
 	/* Instantiate the regulators */
 	for (i = 0; i < pdata->num_regulators; i++) {
@@ -461,6 +465,7 @@ static int __devinit setup_regulators(struct lp3971 *lp3971,
 		regulator_unregister(lp3971->rdev[i]);
 	kfree(lp3971->rdev);
 	lp3971->rdev = NULL;
+err_nomem:
 	return err;
 }