Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp244635pxf; Wed, 10 Mar 2021 05:32:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJzv5bbC+Q4ih9hPBKDD44ewiCEJ20pTb/7/70vLEOwICkfNDxEECkbpXhXcINg93P45PtRA X-Received: by 2002:a17:906:3849:: with SMTP id w9mr3703487ejc.7.1615383157752; Wed, 10 Mar 2021 05:32:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615383157; cv=none; d=google.com; s=arc-20160816; b=q8NNCQUb1WZOqPWVp8HoYZuQnz3lJMGZXY2bF7WGb1GMUqxhRrrpO3PUcvA+H+3sLn +4k/aeYwTEb/TugQ5/axSqCxaw7VOEzN5+he2hDAIgotw6w0PVuGAG9BlPYZ1fGjxcs5 gPVP3Gcuxw0vnVCEXRnIhEw8dTElQoV/NsPiUbFN4azBOZC9eyZrxxjWdpZw+4lw7fOt zZ5NLF3lhkaLkq3CS+osW7NY4tWpQSdFVVdFVrL73KG5g2M+iz/K1jY/SjfyS182JFJI ZcV245svwrgjBOlzwE129SUHvHcN+YC5jI+WgjX1c59NotuWgBRcgNNrIU63Jw5BMyB3 rRuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/DcQKgv2hoxkSTJd2wncRkzLCKcHSC46CVWNqJ3oCS8=; b=0t+eR3KiHtjUuns4lCWJ8CrWCnkQMICYTxgU7uWB/AXbrNiAbkDL3OlMiOpceswwHU tAUeCGFKgf6qagR9bSeTV++1qNbWr/aQkRDjZjcmWI0Bt/roeKiMXJfOFdrpQoofO/ht qtVk2mda+wwWxeFyNDWZLhHrqxqd4U4Kg+PCZegVDr2O7HEI6YQPhBzQ3sXSC10MEq5W 15BQwYdSGJNTDs8yQUJEau+mpOAp6SvF2Y/53yPYK2J6+KRVQ1esPEJEnyBHclM758nJ DVMAVz2+MYpkmbYMg/ZAzP/VfmNUEx/2KaadIBg7C7z7HXGl21cc/cEVSCo44wku1odz xhyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=HTz6+XAW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w21si11374768ejb.465.2021.03.10.05.32.13; Wed, 10 Mar 2021 05:32:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=HTz6+XAW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234115AbhCJNbU (ORCPT + 99 others); Wed, 10 Mar 2021 08:31:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:48034 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233313AbhCJNZV (ORCPT ); Wed, 10 Mar 2021 08:25:21 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id B9ADD6504F; Wed, 10 Mar 2021 13:25:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615382720; bh=ZjTosE1btrgNQ9yia2PYQqA6APnbfePX61NsH64nF20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HTz6+XAWwY+OHDCEUrc0+aG3WxZwDBuJWRhJfkHeDIsJr3jgsTVTefkSg109ZPePL hxJKbyO6Dqswnq+PbD4imdGuyJZi4H91LzpbClCMzvDpkm0HswrSNsARUmu3oBHYqt 6uLeA3jhL67eVYsRFvwXlP1YYWryQuoCZSWiBW4A= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Takashi Iwai , Sasha Levin Subject: [PATCH 4.19 16/39] ALSA: ctxfi: cthw20k2: fix mask on conf to allow 4 bits Date: Wed, 10 Mar 2021 14:24:24 +0100 Message-Id: <20210310132320.236653992@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210310132319.708237392@linuxfoundation.org> References: <20210310132319.708237392@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Colin Ian King [ 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 Link: https://lore.kernel.org/r/20210227001527.1077484-1-colin.king@canonical.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- 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 3c966fafc754..6c9ab602212e 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