projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 'mmc/upstream' into late/mvebu2
[cascardo/linux.git]
/
drivers
/
regulator
/
tps80031-regulator.c
diff --git
a/drivers/regulator/tps80031-regulator.c
b/drivers/regulator/tps80031-regulator.c
index
b15d711
..
9019d0e
100644
(file)
--- 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);