diff options
| author | Axel Lin <axel.lin@ingics.com> | 2013-04-13 16:05:43 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-15 18:21:18 +0200 |
| commit | a2f07305e53545dceb08724ed86345c198b2a91a (patch) | |
| tree | 893c2a319f44091bd12e0d57df59df502083abc6 /drivers/regulator | |
| parent | Linux 3.9-rc7 (diff) | |
| download | linux-a2f07305e53545dceb08724ed86345c198b2a91a.tar.xz linux-a2f07305e53545dceb08724ed86345c198b2a91a.zip | |
regulator: max8997: Test pdata by NULL checking instead of IS_ERR_OR_NULL
pdata is either a valid pointer or NULL, use NULL checking rather than
IS_ERR_OR_NULL macro.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
| -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) 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; } |