diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-12-19 06:22:11 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-12-19 06:22:11 -0500 |
| commit | 356f402da0f989b16e4b6849e88dba5df0e25944 (patch) | |
| tree | d1d41d07abf30bdd7fe1498f6eb239eaced6d9b3 /drivers/regulator/as3722-regulator.c | |
| parent | 3a6c5d8ad0a9253aafb76df3577edcb68c09b939 (diff) | |
| parent | 96b7fe0119b932ad25451d2b6357e727bbe6a309 (diff) | |
Merge tag 'asoc-v3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.13
The fixes here are all driver specific ones, none of which particularly
stand out but all of which are useful to users of those drivers.
Diffstat (limited to 'drivers/regulator/as3722-regulator.c')
| -rw-r--r-- | drivers/regulator/as3722-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/as3722-regulator.c b/drivers/regulator/as3722-regulator.c index 5917fe3dc983..b9f1d24c6812 100644 --- a/drivers/regulator/as3722-regulator.c +++ b/drivers/regulator/as3722-regulator.c | |||
| @@ -590,8 +590,8 @@ static int as3722_sd016_set_current_limit(struct regulator_dev *rdev, | |||
| 590 | default: | 590 | default: |
| 591 | return -EINVAL; | 591 | return -EINVAL; |
| 592 | } | 592 | } |
| 593 | ret <<= ffs(mask) - 1; | ||
| 593 | val = ret & mask; | 594 | val = ret & mask; |
| 594 | val <<= ffs(mask) - 1; | ||
| 595 | return as3722_update_bits(as3722, reg, mask, val); | 595 | return as3722_update_bits(as3722, reg, mask, val); |
| 596 | } | 596 | } |
| 597 | 597 | ||
