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 <[email protected]>
Acked-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Mark Brown <[email protected]>

diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c
index 95aed552139a1a363bd54d8d88bc7a97486beb81..cc8debce752f73055a3253f5ac0928803fbc1091 100644 (file)
--- 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);
                }
        }