Skip to content

Commit

Permalink
Merge remote-tracking branch 'regulator/topic/fan53555' into v3.9-rc8
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Apr 28, 2013
2 parents 1d60a4c + eb8ad60 commit 5f19a85
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/regulator/fan53555.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

}

Expand Down

0 comments on commit 5f19a85

Please sign in to comment.