diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 07:45:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 07:45:46 +0100 |
| commit | 6be325719b3e54624397e413efd4b33a997e55a3 (patch) | |
| tree | 57f321a56794cab2222e179b16731e0d76a4a68a /drivers/regulator/lp3971.c | |
| parent | be2net: fix bug in rx page posting (diff) | |
| parent | Linux 2.6.33-rc5 (diff) | |
| download | linux-6be325719b3e54624397e413efd4b33a997e55a3.tar.xz linux-6be325719b3e54624397e413efd4b33a997e55a3.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/regulator/lp3971.c')
| -rw-r--r-- | drivers/regulator/lp3971.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c index 7803a320543b..76d08c282f9c 100644 --- a/drivers/regulator/lp3971.c +++ b/drivers/regulator/lp3971.c @@ -446,8 +446,8 @@ static int setup_regulators(struct lp3971 *lp3971, lp3971->rdev[i] = regulator_register(®ulators[id], lp3971->dev, pdata->regulators[i].initdata, lp3971); - err = IS_ERR(lp3971->rdev[i]); - if (err) { + if (IS_ERR(lp3971->rdev[i])) { + err = PTR_ERR(lp3971->rdev[i]); dev_err(lp3971->dev, "regulator init failed: %d\n", err); goto error; |