From patchwork Wed Apr 22 09:56:33 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: 227327 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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 0324CC55186 for ; Wed, 22 Apr 2020 10:06:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CAA082077D for ; Wed, 22 Apr 2020 10:05:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587549959; bh=jxPDTHLcyW7xuKbuOk1/YrIV68KsElQp/GXSchGDbHE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ekljO/dO3csFnNGpEf+veslDHtBGfBAjXc2tzk6dWwwThzj0V/7/s4ps1feUYDPUw ZVhQ3uYA5M3z3u0zt3GNsGFcNg5MaWGJ8zZGrKfGbTz99UCbHZxt1LSBBCqiq/9jI7 gY3w6lW2yr0FWBYXmPvowyhl5KJCnePuFC1+1ehU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728266AbgDVKF6 (ORCPT ); Wed, 22 Apr 2020 06:05:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:57564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728261AbgDVKF5 (ORCPT ); Wed, 22 Apr 2020 06:05:57 -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 1DA3C20774; Wed, 22 Apr 2020 10:05:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587549957; bh=jxPDTHLcyW7xuKbuOk1/YrIV68KsElQp/GXSchGDbHE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dRRW9qo70tS93+IKNM5/BbDci7+QOPI/PUTWPf5RFQTiulbpGzUINxe2g6nIGvnUd bbmuaPNXNex4A1zveVJlRCNY8cInXgjEczd/nF5lGbGL6IvIQjaGOczgyEJUI8vWWW NGSthUnxCvKdj8ACySSilUjmjn0TqYO6stN+AjNo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 4.9 076/125] ALSA: usb-audio: Dont override ignore_ctl_error value from the map Date: Wed, 22 Apr 2020 11:56:33 +0200 Message-Id: <20200422095045.414780998@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095032.909124119@linuxfoundation.org> References: <20200422095032.909124119@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 @@ -2336,7 +2336,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; } }