aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-29 03:14:35 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-29 03:14:35 (GMT)
commit1433d0905f98584abe74c219869d138304b3c9e1 (patch)
treebe9a815b9e03a18e81c182f12b5c95526e490307
parent3c3a6aae5d09f7177ff781e6a7c6d53cbbe1d146 (diff)
parentd4cbca9ef822e05d4b55e7d0f1cdfded7a472a56 (diff)
Merge remote-tracking branch 'regulator/fix/tps80031' into tmp
-rw-r--r--drivers/regulator/tps80031-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c
index b15d711..9019d0e 100644
--- a/drivers/regulator/tps80031-regulator.c
+++ b/drivers/regulator/tps80031-regulator.c
@@ -728,7 +728,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
}
}
rdev = regulator_register(&ri->rinfo->desc, &config);
- if (IS_ERR_OR_NULL(rdev)) {
+ if (IS_ERR(rdev)) {
dev_err(&pdev->dev,
"register regulator failed %s\n",
ri->rinfo->desc.name);

Privacy Policy