Merge remote-tracking branch 'regulator/topic/fan53555' into v3.9-rc8

5f19a85b · Mark Brown · 1d60a4cf · eb8ad609 · 5f19a85b
Commit 5f19a85b authored Apr 28, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

drivers/regulator/fan53555.c drivers/regulator/fan53555.c +1 -3

No files found.
--- 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_RET(di->rdev);
-		return PTR_ERR(di->rdev);
-	return 0;
 }