diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-28 16:37:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-28 16:37:31 -0400 |
| commit | 1d16b0f2f3edf05f12a9e3960588e0d4854157bb (patch) | |
| tree | be1de144aa6d189c528384300cc91623122ecd52 /drivers | |
| parent | 032b734d291e3532221b6cf7643a5f41c6261941 (diff) | |
| parent | 4b99fef02510706a73c8400045b4c72514e581c4 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
regulator: fix enabling regulator issue on max8925
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/max8925-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c index b6218f11c957..552cad85ae5a 100644 --- a/drivers/regulator/max8925-regulator.c +++ b/drivers/regulator/max8925-regulator.c | |||
| @@ -109,7 +109,7 @@ static int max8925_is_enabled(struct regulator_dev *rdev) | |||
| 109 | struct max8925_regulator_info *info = rdev_get_drvdata(rdev); | 109 | struct max8925_regulator_info *info = rdev_get_drvdata(rdev); |
| 110 | int ret; | 110 | int ret; |
| 111 | 111 | ||
| 112 | ret = max8925_reg_read(info->i2c, info->vol_reg); | 112 | ret = max8925_reg_read(info->i2c, info->enable_reg); |
| 113 | if (ret < 0) | 113 | if (ret < 0) |
| 114 | return ret; | 114 | return ret; |
| 115 | 115 | ||