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

9eaec296 · Mark Brown · 8ca5e1fa · a2f07305 · 9eaec296
Commit 9eaec296 authored Apr 28, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/regulator/max8997.c drivers/regulator/max8997.c +2 -2

No files found.
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -1035,8 +1035,8 @@ static int max8997_pmic_probe(struct platform_device *pdev)
 	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;
 	}