From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: linus.walleij@linaro.org, broonie@kernel.org,
alsa-devel@alsa-project.org, Lee Jones <lee.jones@linaro.org>,
Takashi Iwai <tiwai@suse.de>
Subject: [PATCH 02/11] ASoC: ab8500: Revert back to find_next_bit()
Date: Thu, 19 Dec 2013 15:54:59 +0000 [thread overview]
Message-ID: <1387468508-12286-3-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1387468508-12286-1-git-send-email-lee.jones@linaro.org>
Commit '166a34d ASoC: ab8500: Fix invalid cast to long pointer'
rather carelessly converts find_next_bit() to fls() (find last
bit set), which are not the same.
Although this implementation may not be portable, the alternative
breaks audio on anything using the AB8500 CODEC, which is a much
greater evil. Besides, this driver will never run on anything
else.
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
sound/soc/codecs/ab8500-codec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 1ad92cb..51ae3e9 100644
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -2322,7 +2322,7 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai,
slot = ffs(tx_mask);
snd_soc_update_bits(codec, AB8500_DASLOTCONF1, mask, slot);
snd_soc_update_bits(codec, AB8500_DASLOTCONF3, mask, slot);
- slot = fls(tx_mask);
+ slot = find_next_bit((unsigned long *)&tx_mask, 32, slot + 1);
snd_soc_update_bits(codec, AB8500_DASLOTCONF2, mask, slot);
snd_soc_update_bits(codec, AB8500_DASLOTCONF4, mask, slot);
break;
@@ -2364,7 +2364,7 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai,
AB8500_ADSLOTSEL(slot),
AB8500_MASK_SLOT(slot),
AB8500_ADSLOTSELX_AD_OUT_TO_SLOT(AB8500_AD_OUT3, slot));
- slot = fls(rx_mask);
+ slot = find_next_bit((unsigned long *)&rx_mask, 32, slot + 1);
snd_soc_update_bits(codec,
AB8500_ADSLOTSEL(slot),
AB8500_MASK_SLOT(slot),
--
1.8.3.2
next prev parent reply other threads:[~2013-12-19 15:54 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-19 15:54 [PATCH 00/10] ASoC: ARM: ux500: Better prepare for full Device Tree Lee Jones
2013-12-19 15:54 ` [PATCH 01/11] ARM: ux500: Don't use enums for MSP IDs - for easy DT conversion Lee Jones
2014-01-07 14:03 ` Linus Walleij
2014-01-07 14:11 ` Lee Jones
2014-01-07 14:19 ` Mark Brown
2014-01-07 14:44 ` Lee Jones
2014-01-07 15:36 ` Mark Brown
2013-12-19 15:54 ` Lee Jones [this message]
2013-12-19 16:06 ` [PATCH 02/11] ASoC: ab8500: Revert back to find_next_bit() Takashi Iwai
2013-12-19 16:48 ` Lee Jones
2013-12-19 17:29 ` Takashi Iwai
2013-12-20 14:02 ` Lee Jones
2013-12-20 14:23 ` Takashi Iwai
2013-12-23 10:38 ` Takashi Iwai
2013-12-19 15:55 ` [PATCH 03/11] ASoC: ux500: Provide better checking for Device Tree and/or Platform Data Lee Jones
2014-01-07 15:37 ` Mark Brown
2013-12-19 15:55 ` [PATCH 04/11] ASoC: Ux500: Match platform by device node when booting Device Tree Lee Jones
2014-01-07 15:37 ` Mark Brown
2013-12-19 15:55 ` [PATCH 05/11] ASoC: ux500_pcm: Stop pretending that we support varying address widths Lee Jones
2014-01-07 15:38 ` Mark Brown
2013-12-19 15:55 ` [PATCH 06/11] ASoC: ux500_pcm: Expect different saved DMA data when obtaining from DAI store Lee Jones
2014-01-07 15:38 ` Mark Brown
2013-12-19 15:55 ` [PATCH 07/11] ASoC: ux500_pcm: Extend Device Tree support to deal with DMA data Lee Jones
2014-01-07 15:38 ` Mark Brown
2013-12-19 15:55 ` [PATCH 08/11] ASoC: ux500: Store DMA data in the DAI differently in the pdata and DT case Lee Jones
2014-01-07 15:38 ` Mark Brown
2013-12-19 15:55 ` [PATCH 09/11] ASoC: ux500_pcm: Take out pointless dev_dbg() call Lee Jones
2014-01-07 15:38 ` Mark Brown
2013-12-19 15:55 ` [PATCH 10/11] ASoC: ux500_pcm: Differentiate between pdata and DT initialisation Lee Jones
2014-01-07 15:39 ` Mark Brown
2013-12-19 15:55 ` [PATCH 11/11] ASoC: ux500: Dramatically reduce the size of the DAI driver data struct Lee Jones
2014-01-07 15:39 ` Mark Brown
2013-12-21 14:29 ` [PATCH 00/10] ASoC: ARM: ux500: Better prepare for full Device Tree Mark Brown
2013-12-21 17:19 ` Lee Jones
2014-01-07 14:06 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387468508-12286-3-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).