Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp4138751pxk; Tue, 8 Sep 2020 11:38:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzP2n9tFkfN3Sg4KBOiZtjm3SVSWL9Ma2PY/eOa62IYOIzTYrjJF+BEgJGnewAJ25MkFE+s X-Received: by 2002:a17:906:1b:: with SMTP id 27mr26656700eja.169.1599590297103; Tue, 08 Sep 2020 11:38:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599590297; cv=none; d=google.com; s=arc-20160816; b=WjmONAw2HpHizj9YUfGzUY2eg8jGFHEzOSB3OKlBz2arrioGVLdb049MV0i5K/amR/ i3xRcUO/Fn0r22lydqeknCylTVnE1chO4Qy3Q7Ys+3gsQa5I4QpGmeYSdnILiBcF0ter d8I6sefVcuGACZM+QMkPnxwWci9rhLyiyn9x+Z4pGxDwgdWKNfOHdry2hroKWHwBEJJF TL23wNrVorxTvFR+kD8VByz+KvPqUV8nonTbwMCRI+R9KwKmduDfHwicQtfKSBdnIhEF 6VkSpBLK6k6RnorqBEi0RQHSM9O3jKQzK+Hlh/wsKnROKhvmFNocyQmwrO/DYt5b6g20 PuhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8Yn3FAgNCqclBJfl76P8lJmqPVqI2X3Z7XF0yOhNc2c=; b=Gtr5utcPZ3fUNbw+bbtUC8nZQWqEqwrkoWeurojzZgwCrk4zUr/nhIdtttj3+TBFCz peDlFfKxIPpzvfQUAIRjRVaCi7NFcBn5hOzOAEx2oBQeCFVuXo6RrJ9cEFFZWkfGMX0G BvFytPYP32KzE6WdqTHvLY/knyf7WYiH9eqDCT9/EODy4LJrk40Kz6xEmG0Fmhl88iym c+QoUhqBAEEtMhhUmuy4SfrmEMzOOFUnBb55a7x6/9BKXKF7HIn8czCQTEKlLwnzl0Gt 06xvudX087P/UKzhoDWXUujX14L09y1QoxmXT4D5+qticUmMfYNpOwMb137MM9oTS/bN XdPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cfe2M1xj; 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=fail (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 dr13si10025270ejc.638.2020.09.08.11.37.54; Tue, 08 Sep 2020 11:38:17 -0700 (PDT) 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=@kernel.org header.s=default header.b=cfe2M1xj; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731599AbgIHScJ (ORCPT + 99 others); Tue, 8 Sep 2020 14:32:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:56080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731379AbgIHQJf (ORCPT ); Tue, 8 Sep 2020 12:09:35 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 E3B002417F; Tue, 8 Sep 2020 15:49:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599580199; bh=be8mms4bynzjUv3v7/LKZ5ue6Mbiq6Mt8ONefCp1C8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cfe2M1xjPKfRY9UPwb2ELVn+dJnDTbD81a67MASP7pZsCK9C1dcIXYoijkMzA8jP9 dpi8cmyvC1inB8vFPhPSd6TSyK9HX46lT75HjjmiuuQwxPS00QqHodDEQu2+Xob8FY CoPW0kvrLsZ1L6uyqeNe62m7QEKHBKIINW8LEgqY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Simon Wood , Takashi Sakamoto , Takashi Iwai Subject: [PATCH 4.19 69/88] ALSA: firewire-digi00x: exclude Avid Adrenaline from detection Date: Tue, 8 Sep 2020 17:26:10 +0200 Message-Id: <20200908152224.621006485@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152221.082184905@linuxfoundation.org> References: <20200908152221.082184905@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Sakamoto commit acd46a6b6de88569654567810acad2b0a0a25cea upstream. Avid Adrenaline is reported that ALSA firewire-digi00x driver is bound to. However, as long as he investigated, the design of this model is hardly similar to the one of Digi 00x family. It's better to exclude the model from modalias of ALSA firewire-digi00x driver. This commit changes device entries so that the model is excluded. $ python3 crpp < ~/git/am-config-rom/misc/avid-adrenaline.img ROM header and bus information block ----------------------------------------------------------------- 400 04203a9c bus_info_length 4, crc_length 32, crc 15004 404 31333934 bus_name "1394" 408 e064a002 irmc 1, cmc 1, isc 1, bmc 0, cyc_clk_acc 100, max_rec 10 (2048) 40c 00a07e01 company_id 00a07e | 410 00085257 device_id 0100085257 | EUI-64 00a07e0100085257 root directory ----------------------------------------------------------------- 414 0005d08c directory_length 5, crc 53388 418 0300a07e vendor 41c 8100000c --> descriptor leaf at 44c 420 0c008380 node capabilities 424 8d000002 --> eui-64 leaf at 42c 428 d1000004 --> unit directory at 438 eui-64 leaf at 42c ----------------------------------------------------------------- 42c 0002410f leaf_length 2, crc 16655 430 00a07e01 company_id 00a07e | 434 00085257 device_id 0100085257 | EUI-64 00a07e0100085257 unit directory at 438 ----------------------------------------------------------------- 438 0004d6c9 directory_length 4, crc 54985 43c 1200a02d specifier id: 1394 TA 440 13014001 version: Vender Unique and AV/C 444 17000001 model 448 81000009 --> descriptor leaf at 46c descriptor leaf at 44c ----------------------------------------------------------------- 44c 00077205 leaf_length 7, crc 29189 450 00000000 textual descriptor 454 00000000 minimal ASCII 458 41766964 "Avid" 45c 20546563 " Tec" 460 686e6f6c "hnol" 464 6f677900 "ogy" 468 00000000 descriptor leaf at 46c ----------------------------------------------------------------- 46c 000599a5 leaf_length 5, crc 39333 470 00000000 textual descriptor 474 00000000 minimal ASCII 478 41647265 "Adre" 47c 6e616c69 "nali" 480 6e650000 "ne" Reported-by: Simon Wood Fixes: 9edf723fd858 ("ALSA: firewire-digi00x: add skeleton for Digi 002/003 family") Cc: # 4.4+ Signed-off-by: Takashi Sakamoto Link: https://lore.kernel.org/r/20200823075545.56305-1-o-takashi@sakamocchi.jp Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/firewire/digi00x/digi00x.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/sound/firewire/digi00x/digi00x.c +++ b/sound/firewire/digi00x/digi00x.c @@ -15,6 +15,7 @@ MODULE_LICENSE("GPL v2"); #define VENDOR_DIGIDESIGN 0x00a07e #define MODEL_CONSOLE 0x000001 #define MODEL_RACK 0x000002 +#define SPEC_VERSION 0x000001 static int name_card(struct snd_dg00x *dg00x) { @@ -185,14 +186,18 @@ static const struct ieee1394_device_id s /* Both of 002/003 use the same ID. */ { .match_flags = IEEE1394_MATCH_VENDOR_ID | + IEEE1394_MATCH_VERSION | IEEE1394_MATCH_MODEL_ID, .vendor_id = VENDOR_DIGIDESIGN, + .version = SPEC_VERSION, .model_id = MODEL_CONSOLE, }, { .match_flags = IEEE1394_MATCH_VENDOR_ID | + IEEE1394_MATCH_VERSION | IEEE1394_MATCH_MODEL_ID, .vendor_id = VENDOR_DIGIDESIGN, + .version = SPEC_VERSION, .model_id = MODEL_RACK, }, {}