From patchwork Mon Apr 20 12:39:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 227444 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87603C54FCB for ; Mon, 20 Apr 2020 12:50:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 68317206E9 for ; Mon, 20 Apr 2020 12:50:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587387007; bh=SlExHaIgXferkf1udhtzIFSsULLAhcki2TYu07FUUoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JnKA8qN1oUpCfJOFQ1zBKw1VU7K1Fd8qy1PM7mkaOaX8PvgL1i06qoyuBjif8jkvi hpm/dcoh15QtJAYWJAxBAwcAHl6GbzGAmkJA1yjEDSga3oyxkhabbt+wNmekWgGC+U WLOq5CUUR1KgvlaCqEQcKwARweWzZoP0KcJ8/0/E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729473AbgDTMtn (ORCPT ); Mon, 20 Apr 2020 08:49:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:46844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729460AbgDTMtm (ORCPT ); Mon, 20 Apr 2020 08:49:42 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9143720736; Mon, 20 Apr 2020 12:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386982; bh=SlExHaIgXferkf1udhtzIFSsULLAhcki2TYu07FUUoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T1JIMYzPbLJiHWcFwu/tfc1omkmlgn8VOj8071uge6lrXU7PhnjNMqJmKNgqKlTV1 OckGlXm73KTbiUgnF5Fs+zhLi1ebRDN1dgw61gLm7mKcTW4V7ihl9wrw9Uh9ECttZL i0uAWmI+zuUwkfQD6rWR8o6o2bWNWKbMcjsvq3+0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 4.19 18/40] ALSA: usb-audio: Dont override ignore_ctl_error value from the map Date: Mon, 20 Apr 2020 14:39:28 +0200 Message-Id: <20200420121459.493428044@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121444.178150063@linuxfoundation.org> References: <20200420121444.178150063@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Takashi Iwai commit 3507245b82b4362dc9721cbc328644905a3efa22 upstream. The mapping table may contain also ignore_ctl_error flag for devices that are known to behave wild. Since this flag always writes the card's own ignore_ctl_error flag, it overrides the value already set by the module option, so it doesn't follow user's expectation. Let's fix the code not to clear the flag that has been set by user. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=206873 Cc: Link: https://lore.kernel.org/r/20200412081331.4742-3-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -3104,7 +3104,7 @@ static int snd_usb_mixer_controls(struct if (map->id == state.chip->usb_id) { state.map = map->map; state.selector_map = map->selector_map; - mixer->ignore_ctl_error = map->ignore_ctl_error; + mixer->ignore_ctl_error |= map->ignore_ctl_error; break; } }