From 019beb7d026d66916d2f44a90a6ba76ece2d037a Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Thu, 2 Aug 2012 18:12:04 +0530 Subject: regulator: tps65090: Use IS_ERR to check return value of regulator_register regulator_register never returns NULL. Signed-off-by: Axel Lin Acked by: Venu Byravarasu Signed-off-by: Mark Brown (Cherry-picked from mainline 0ca2d6e65268477a53f959320a43d13b0c4d6b70) Conflicts: drivers/regulator/tps65090-regulator.c Change-Id: Id79e2beb2a3e278ace32054c19c463783f334a16 Signed-off-by: Laxman Dewangan Reviewed-on: http://git-master/r/120372 --- drivers/regulator/tps65090-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/regulator') 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); -- cgit v1.2.3