diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2013-12-23 11:42:55 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2014-01-02 11:54:15 +0000 |
| commit | f60e5473e6788f93849a61198bec4e02fea31e51 (patch) | |
| tree | cf211455da24d174f6187dd4a6d40ef24925ad36 | |
| parent | Linux 3.13-rc1 (diff) | |
| download | linux-dev-f60e5473e6788f93849a61198bec4e02fea31e51.tar.xz linux-dev-f60e5473e6788f93849a61198bec4e02fea31e51.zip | |
ASoC: ssm2518: Fix off-by-one error by ffs()
ffs() returns the bit position from 1, while the ssm2158 driver code
assumes it being 0-based. Also, the bit mask computation of the two
channel slots are incorrect; it must have worked just casually.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/codecs/ssm2518.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c index 95aed552139a..cc8debce752f 100644 --- a/sound/soc/codecs/ssm2518.c +++ b/sound/soc/codecs/ssm2518.c @@ -549,13 +549,13 @@ static int ssm2518_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, right_slot = 0; } else { /* We assume the left channel < right channel */ - left_slot = ffs(tx_mask); - tx_mask &= ~(1 << tx_mask); + left_slot = __ffs(tx_mask); + tx_mask &= ~(1 << left_slot); if (tx_mask == 0) { right_slot = left_slot; } else { - right_slot = ffs(tx_mask); - tx_mask &= ~(1 << tx_mask); + right_slot = __ffs(tx_mask); + tx_mask &= ~(1 << right_slot); } } |