diff --git a/[refs] b/[refs]
index 62d38d9c8009..9c1b16438e28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f503071b03dcac6908fb7e051cfc9c45bea084c0
+refs/heads/master: baf73e2c4e25aa57a7bd5df90a93e65be0542c74
diff --git a/trunk/drivers/regulator/lp872x.c b/trunk/drivers/regulator/lp872x.c
index d51d09852041..e8f54efb1985 100644
--- a/trunk/drivers/regulator/lp872x.c
+++ b/trunk/drivers/regulator/lp872x.c
@@ -785,11 +785,6 @@ static int lp872x_config(struct lp872x *lp)
 	struct lp872x_platform_data *pdata = lp->pdata;
 	int ret;
 
-	if (!pdata) {
-		dev_warn(lp->dev, "no platform data\n");
-		return 0;
-	}
-
 	if (!pdata->update_config)
 		return 0;
 
@@ -889,6 +884,11 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
 		[LP8725] = LP8725_NUM_REGULATORS,
 	};
 
+	if (!pdata) {
+		dev_warn(&cl->dev, "no platform data\n");
+		return -EINVAL;
+	}
+
 	lp = devm_kzalloc(&cl->dev, sizeof(struct lp872x), GFP_KERNEL);
 	if (!lp)
 		goto err_mem;