summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:39 +0100
committerMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:39 +0100
commit5f19a85ba728de8a1eca8b8ae239cc27f9449985 (patch)
tree2f25d1a821b9f9f7eb84a73eb355d5fa9011c14b
parent1d60a4cf975a196d585149e667f58cbca1a574fc (diff)
parenteb8ad609912cd468b23467892a1c80ff2d610716 (diff)
downloadlinux-5f19a85ba728de8a1eca8b8ae239cc27f9449985.tar.bz2
Merge remote-tracking branch 'regulator/topic/fan53555' into v3.9-rc8
-rw-r--r--drivers/regulator/fan53555.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c
index 9165b0c40ed3..f0e1ae52bb05 100644
--- a/drivers/regulator/fan53555.c
+++ b/drivers/regulator/fan53555.c
@@ -219,9 +219,7 @@ static int fan53555_regulator_register(struct fan53555_device_info *di,
rdesc->owner = THIS_MODULE;
di->rdev = regulator_register(&di->desc, config);
- if (IS_ERR(di->rdev))
- return PTR_ERR(di->rdev);
- return 0;
+ return PTR_RET(di->rdev);
}