From patchwork Mon Aug 17 15:17:13 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: 266279 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=-9.8 required=3.0 tests=BAYES_00,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=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 75E78C433E1 for ; Mon, 17 Aug 2020 17:56:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 396B320716 for ; Mon, 17 Aug 2020 17:56:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597687007; bh=Kp8YB+cckSSzEOMiviR23Op7YTUgP0UQ2ytfzormX48=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MJC8YdIDWEI3E4UZjJw2r1wEDfDlscXBJQi9i6aAiu8axuhZS93Hk/Da+RvNWuDc9 jiWeZHEjMaYzGL1He8fE/xZnZ2bP2nSz5BEPe7wwaCDcILCEmbr30Qn6F7+KhC1iIm IhKAzInnvGuTEB5UX/6paFfXnvkZNkUuCXTf4Y2A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389564AbgHQR4n (ORCPT ); Mon, 17 Aug 2020 13:56:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:35748 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388551AbgHQQK3 (ORCPT ); Mon, 17 Aug 2020 12:10:29 -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 DDD6F22DA7; Mon, 17 Aug 2020 16:10:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680627; bh=Kp8YB+cckSSzEOMiviR23Op7YTUgP0UQ2ytfzormX48=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XS679j2JrGyiID5S+YI6N90Azk9epqgEs39Dq5ds5Pyq8J/wQPjiomdSzN2VCCCqs 6zooCOUn+ZVNcsNtmn7CnlWHELpyIiZVlF+/3J/4eR/XdgSdNVvc5A2rNOUR1g/sde d+M4FQPNungMwNY4kQ2haQcYPmLIWItXWOdewCVE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hector Martin , Takashi Iwai Subject: [PATCH 5.4 232/270] ALSA: usb-audio: fix overeager device match for MacroSilicon MS2109 Date: Mon, 17 Aug 2020 17:17:13 +0200 Message-Id: <20200817143807.353670508@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143755.807583758@linuxfoundation.org> References: <20200817143755.807583758@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: Hector Martin commit 14a720dc1f5332f3bdf30a23a3bc549e81be974c upstream. Matching by device matches all interfaces, which breaks the video/HID portions of the device depending on module load order. Fixes: e337bf19f6af ("ALSA: usb-audio: add quirk for MacroSilicon MS2109") Cc: stable@vger.kernel.org Signed-off-by: Hector Martin Link: https://lore.kernel.org/r/20200810045319.128745-1-marcan@marcan.st Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/quirks-table.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3623,7 +3623,13 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* A * with. */ { - USB_DEVICE(0x534d, 0x2109), + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | + USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x534d, + .idProduct = 0x2109, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { .vendor_name = "MacroSilicon", .product_name = "MS2109",