diff options
| author | Colin Ian King <colin.king@canonical.com> | 2021-02-27 00:15:27 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-11 13:48:03 +0100 |
| commit | 44e48ebe5d17fcd0b42d7a4059eea5619737e948 (patch) | |
| tree | f17ce6ce35a9503c1a4d48d1e1d9c1396541461e | |
| parent | 4f836aa4fc449693e3e79cfe7e1fc08a3ea967aa (diff) | |
| download | linux-stable-44e48ebe5d17fcd0b42d7a4059eea5619737e948.tar.gz linux-stable-44e48ebe5d17fcd0b42d7a4059eea5619737e948.tar.bz2 linux-stable-44e48ebe5d17fcd0b42d7a4059eea5619737e948.zip | |
ALSA: ctxfi: cthw20k2: fix mask on conf to allow 4 bits
[ Upstream commit 26a9630c72ebac7c564db305a6aee54a8edde70e ]
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>
Link: https://lore.kernel.org/r/20210227001527.1077484-1-colin.king@canonical.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | sound/pci/ctxfi/cthw20k2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c index 18ee7768b7c4..ae8aa10a4a5d 100644 --- a/sound/pci/ctxfi/cthw20k2.c +++ b/sound/pci/ctxfi/cthw20k2.c @@ -995,7 +995,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; |