diff options
| author | Linus Torvalds | 2010-10-04 22:35:48 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-10-04 22:35:48 +0200 |
| commit | 2f6b3aa7a563d05453c4d73ccf88191aee84333f (patch) | |
| tree | 25e19592cc7f969005ffe46f8d250f55c103967b /drivers/regulator/max8649.c | |
| parent | Merge branch 'merge-powerpc' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
| parent | regulator: max8649 - fix setting extclk_freq (diff) | |
| download | kernel-qcow2-linux-2f6b3aa7a563d05453c4d73ccf88191aee84333f.tar.gz kernel-qcow2-linux-2f6b3aa7a563d05453c4d73ccf88191aee84333f.tar.xz kernel-qcow2-linux-2f6b3aa7a563d05453c4d73ccf88191aee84333f.zip | |
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: max8649 - fix setting extclk_freq
regulator: fix typo in current units
regulator: fix device_register() error handling
Diffstat (limited to 'drivers/regulator/max8649.c')
| -rw-r--r-- | drivers/regulator/max8649.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c index 4520ace3f7e7..6b60a9c0366b 100644 --- a/drivers/regulator/max8649.c +++ b/drivers/regulator/max8649.c @@ -330,7 +330,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client, /* set external clock frequency */ info->extclk_freq = pdata->extclk_freq; max8649_set_bits(info->i2c, MAX8649_SYNC, MAX8649_EXT_MASK, - info->extclk_freq); + info->extclk_freq << 6); } if (pdata->ramp_timing) { |