diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-27 21:13:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-27 21:13:43 -0400 |
| commit | 9eaec296d064846dbc21fa020f5e16e53bdcc5a3 (patch) | |
| tree | 8a69e0762e040aa878458ecad13fd0a44bc57dc7 | |
| parent | 8ca5e1fa9e7c5294e7cb09def81d8408a92faa2e (diff) | |
| parent | a2f07305e53545dceb08724ed86345c198b2a91a (diff) | |
Merge remote-tracking branch 'regulator/topic/max8997' into v3.9-rc8
| -rw-r--r-- | drivers/regulator/max8997.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c index 0ac7a87519b4..df20069f0537 100644 --- a/drivers/regulator/max8997.c +++ b/drivers/regulator/max8997.c | |||
| @@ -1035,8 +1035,8 @@ static int max8997_pmic_probe(struct platform_device *pdev) | |||
| 1035 | int i, ret, size, nr_dvs; | 1035 | int i, ret, size, nr_dvs; |
| 1036 | u8 max_buck1 = 0, max_buck2 = 0, max_buck5 = 0; | 1036 | u8 max_buck1 = 0, max_buck2 = 0, max_buck5 = 0; |
| 1037 | 1037 | ||
| 1038 | if (IS_ERR_OR_NULL(pdata)) { | 1038 | if (!pdata) { |
| 1039 | dev_err(pdev->dev.parent, "No platform init data supplied.\n"); | 1039 | dev_err(&pdev->dev, "No platform init data supplied.\n"); |
| 1040 | return -ENODEV; | 1040 | return -ENODEV; |
| 1041 | } | 1041 | } |
| 1042 | 1042 | ||