lkml.org 
[lkml]   [2021]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 05/20] ALSA: ctxfi: cthw20k2: fix mask on conf to allow 4 bits
    Date
    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    From: Colin Ian King <colin.king@canonical.com>

    [ 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>
    ---
    sound/pci/ctxfi/cthw20k2.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
    index b866d6b2c923..e603db4d5ef3 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;
    --
    2.30.1


    \
     
     \ /
      Last update: 2021-03-10 14:29    [W:5.063 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site