diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2012-08-02 18:12:04 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-08-02 18:14:17 -0700 |
| commit | 019beb7d026d66916d2f44a90a6ba76ece2d037a (patch) | |
| tree | bd240559ef66291dd5d4cf397edea44a458f20d5 /drivers/regulator | |
| parent | ccf0f3f89e957828412db44370133fb8fa29473e (diff) | |
regulator: tps65090: Use IS_ERR to check return value of regulator_register
regulator_register never returns NULL.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked by: Venu Byravarasu <vbyravarasu@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
(Cherry-picked from mainline
0ca2d6e65268477a53f959320a43d13b0c4d6b70)
Conflicts:
drivers/regulator/tps65090-regulator.c
Change-Id: Id79e2beb2a3e278ace32054c19c463783f334a16
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/120372
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/tps65090-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c index 0dee06d826d3..7dc4e1c5466c 100644 --- a/drivers/regulator/tps65090-regulator.c +++ b/drivers/regulator/tps65090-regulator.c @@ -153,7 +153,7 @@ static int __devinit tps65090_regulator_probe(struct platform_device *pdev) rdev = regulator_register(&ri->desc, &pdev->dev, &tps_pdata->regulator, ri); - if (IS_ERR_OR_NULL(rdev)) { + if (IS_ERR(rdev)) { dev_err(&pdev->dev, "failed to register regulator %s\n", ri->desc.name); return PTR_ERR(rdev); |