diff mbox series

ALSA: ctxfi: cthw20k2: fix mask on conf to allow 4 bits

Message ID 20210227001527.1077484-1-colin.king@canonical.com
State Accepted
Commit 26a9630c72ebac7c564db305a6aee54a8edde70e
Headers show
Series ALSA: ctxfi: cthw20k2: fix mask on conf to allow 4 bits | expand

Commit Message

Colin King Feb. 27, 2021, 12:15 a.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

Currently the mask operation on variable conf is just 3 bits so
the switch statement case value of 8 is unreachable dead code.
The function daio_mgr_dao_init can be passed a 4 bit value,
function dao_rsc_init calls it with conf set to:

     conf = (desc->msr & 0x7) | (desc->passthru << 3);

so clearly when desc->passthru is set to 1 then conf can be
at least 8.

Fix this by changing the mask to 0xf.

Fixes: 8cc72361481f ("ALSA: SB X-Fi driver merge")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 sound/pci/ctxfi/cthw20k2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Takashi Iwai Feb. 28, 2021, 8:12 a.m. UTC | #1 
On Sat, 27 Feb 2021 01:15:27 +0100,
Colin King wrote:
> 
> From: Colin Ian King <colin.king@canonical.com>
> 
> Currently the mask operation on variable conf is just 3 bits so
> the switch statement case value of 8 is unreachable dead code.
> The function daio_mgr_dao_init can be passed a 4 bit value,
> function dao_rsc_init calls it with conf set to:
> 
>      conf = (desc->msr & 0x7) | (desc->passthru << 3);
> 
> so clearly when desc->passthru is set to 1 then conf can be
> at least 8.
> 
> Fix this by changing the mask to 0xf.
> 
> Fixes: 8cc72361481f ("ALSA: SB X-Fi driver merge")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied, thanks.


Takashi
diff mbox series

Patch

diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index a855fb8c58bd..55af8ef29838 100644
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -991,7 +991,7 @@  static int daio_mgr_dao_init(void *blk, unsigned int idx, unsigned int conf)
 
 	if (idx < 4) {
 		/* S/PDIF output */
-		switch ((conf & 0x7)) {
+		switch ((conf & 0xf)) {
 		case 1:
 			set_field(&ctl->txctl[idx], ATXCTL_NUC, 0);
 			break;