Merge remote-tracking branch 'regulator/topic/fan53555' into v3.9-rc8
authorMark Brown <broonie@sirena.org.uk>
Sun, 28 Apr 2013 01:13:39 +0000 (02:13 +0100)
committerMark Brown <broonie@sirena.org.uk>
Sun, 28 Apr 2013 01:13:39 +0000 (02:13 +0100)
drivers/regulator/fan53555.c

index 9165b0c..f0e1ae5 100644 (file)
@@ -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);
 
 }