commit 9eaec296d064846dbc21fa020f5e16e53bdcc5a3
author Mark Brown <broonie@sirena.org.uk> Sun Apr 28 02:13:43 2013 +0100
committer Mark Brown <broonie@sirena.org.uk> Sun Apr 28 02:13:43 2013 +0100
tree 8a69e0762e040aa878458ecad13fd0a44bc57dc7
parent 8ca5e1fa9e7c5294e7cb09def81d8408a92faa2e
parent a2f07305e53545dceb08724ed86345c198b2a91a

Merge remote-tracking branch 'regulator/topic/max8997' into v3.9-rc8

drivers/regulator/max8997.c

diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index 0ac7a87..df20069 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -1035,8 +1035,8 @@
 	int i, ret, size, nr_dvs;
 	u8 max_buck1 = 0, max_buck2 = 0, max_buck5 = 0;
 
-	if (IS_ERR_OR_NULL(pdata)) {
-		dev_err(pdev->dev.parent, "No platform init data supplied.\n");
+	if (!pdata) {
+		dev_err(&pdev->dev, "No platform init data supplied.\n");
 		return -ENODEV;
 	}