From mboxrd@z Thu Jan 1 00:00:00 1970 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.7 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 AB44AC432C0 for ; Thu, 21 Nov 2019 16:07:42 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A4C6620637 for ; Thu, 21 Nov 2019 16:07:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="leBF9+B/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A4C6620637 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6CBA9176A; Thu, 21 Nov 2019 17:06:49 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6CBA9176A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1574352459; bh=R0k90eChHb4pNg4OigRlvFeoY/DvGG5QJHNZoTTJQ2c=; h=Date:From:To:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=leBF9+B/d77bPkJGWrR2GldXOhT5GNQEipqjX/XgyHZDMlCgRYKqeVRnAOodS0dtd 09oY7Bss3dcTQae1kYMpzxnihndL5/hiredbZ79E/Jo3qC1lpERz8A8NgiUuP8kJEN 2hA2h2WZhdIA6pTVsiRel2IeEX0EVf8/YH/pGy0c= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id ED279F80145; Thu, 21 Nov 2019 17:06:48 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0485BF80146; Thu, 21 Nov 2019 17:06:47 +0100 (CET) Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 803E3F800EF for ; Thu, 21 Nov 2019 17:06:44 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 803E3F800EF X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 43E3DB087; Thu, 21 Nov 2019 16:06:43 +0000 (UTC) Date: Thu, 21 Nov 2019 17:06:42 +0100 Message-ID: From: Takashi Iwai To: Markus Schroetter In-Reply-To: <861b90c8-8878-c3be-bc8e-769a3638cc14@gmail.com> References: <20191111054133.GA1817@b4.vu> <861b90c8-8878-c3be-bc8e-769a3638cc14@gmail.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Cc: alsa-devel@alsa-project.org Subject: Re: [alsa-devel] [PATCH] ALSA: usb-audio: Fix Scarlett 6i6 Gen 2 port data X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On Thu, 21 Nov 2019 09:52:10 +0100, Markus Schroetter wrote: > > > The s6i6_gen2_info.ports[] array had the Mixer and PCM port type > > entries in the wrong place. Use designators to explicitly specify the > > array elements being set. > > > > Fixes: 9e4d5c1be21f ("ALSA: usb-audio: Scarlett Gen 2 mixer interface") > > Signed-off-by: Geoffrey D. Bennett > > > Reported-by: Jonas Berlin > > > Tested-by: Alex Fellows > > Tested-by: Markus Schroetter Oh this wasn't taken yet. Now merged for 5.5. thanks, Takashi > > --- > > Hi Takashi, > > > > Is there something special I need to do to mark this as a bug fix and > > request this go into 5.4? > > > > Thanks, > > Geoffrey. > > > > sound/usb/mixer_scarlett_gen2.c | 36 ++++++++++++++++----------------- > > 1 file changed, 18 insertions(+), 18 deletions(-) > > > > diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c > > index 7d460b1f1735..94b903d95afa 100644 > > --- a/sound/usb/mixer_scarlett_gen2.c > > +++ b/sound/usb/mixer_scarlett_gen2.c > > @@ -261,34 +261,34 @@ static const struct scarlett2_device_info s6i6_gen2_info = { > > }, > > > > .ports = { > > - { > > + [SCARLETT2_PORT_TYPE_NONE] = { > > .id = 0x000, > > .num = { 1, 0, 8, 8, 8 }, > > .src_descr = "Off", > > .src_num_offset = 0, > > }, > > - { > > + [SCARLETT2_PORT_TYPE_ANALOGUE] = { > > .id = 0x080, > > .num = { 4, 4, 4, 4, 4 }, > > .src_descr = "Analogue %d", > > .src_num_offset = 1, > > .dst_descr = "Analogue Output %02d Playback" > > }, > > - { > > + [SCARLETT2_PORT_TYPE_SPDIF] = { > > .id = 0x180, > > .num = { 2, 2, 2, 2, 2 }, > > .src_descr = "S/PDIF %d", > > .src_num_offset = 1, > > .dst_descr = "S/PDIF Output %d Playback" > > }, > > - { > > + [SCARLETT2_PORT_TYPE_MIX] = { > > .id = 0x300, > > .num = { 10, 18, 18, 18, 18 }, > > .src_descr = "Mix %c", > > .src_num_offset = 65, > > .dst_descr = "Mixer Input %02d Capture" > > }, > > - { > > + [SCARLETT2_PORT_TYPE_PCM] = { > > .id = 0x600, > > .num = { 6, 6, 6, 6, 6 }, > > .src_descr = "PCM %d", > > @@ -317,44 +317,44 @@ static const struct scarlett2_device_info s18i8_gen2_info = { > > }, > > > > .ports = { > > - { > > + [SCARLETT2_PORT_TYPE_NONE] = { > > .id = 0x000, > > .num = { 1, 0, 8, 8, 4 }, > > .src_descr = "Off", > > .src_num_offset = 0, > > }, > > - { > > + [SCARLETT2_PORT_TYPE_ANALOGUE] = { > > .id = 0x080, > > .num = { 8, 6, 6, 6, 6 }, > > .src_descr = "Analogue %d", > > .src_num_offset = 1, > > .dst_descr = "Analogue Output %02d Playback" > > }, > > - { > > + [SCARLETT2_PORT_TYPE_SPDIF] = { > > + .id = 0x180, > > /* S/PDIF outputs aren't available at 192KHz > > * but are included in the USB mux I/O > > * assignment message anyway > > */ > > - .id = 0x180, > > .num = { 2, 2, 2, 2, 2 }, > > .src_descr = "S/PDIF %d", > > .src_num_offset = 1, > > .dst_descr = "S/PDIF Output %d Playback" > > }, > > - { > > + [SCARLETT2_PORT_TYPE_ADAT] = { > > .id = 0x200, > > .num = { 8, 0, 0, 0, 0 }, > > .src_descr = "ADAT %d", > > .src_num_offset = 1, > > }, > > - { > > + [SCARLETT2_PORT_TYPE_MIX] = { > > .id = 0x300, > > .num = { 10, 18, 18, 18, 18 }, > > .src_descr = "Mix %c", > > .src_num_offset = 65, > > .dst_descr = "Mixer Input %02d Capture" > > }, > > - { > > + [SCARLETT2_PORT_TYPE_PCM] = { > > .id = 0x600, > > .num = { 20, 18, 18, 14, 10 }, > > .src_descr = "PCM %d", > > @@ -387,20 +387,20 @@ static const struct scarlett2_device_info s18i20_gen2_info = { > > }, > > > > .ports = { > > - { > > + [SCARLETT2_PORT_TYPE_NONE] = { > > .id = 0x000, > > .num = { 1, 0, 8, 8, 6 }, > > .src_descr = "Off", > > .src_num_offset = 0, > > }, > > - { > > + [SCARLETT2_PORT_TYPE_ANALOGUE] = { > > .id = 0x080, > > .num = { 8, 10, 10, 10, 10 }, > > .src_descr = "Analogue %d", > > .src_num_offset = 1, > > .dst_descr = "Analogue Output %02d Playback" > > }, > > - { > > + [SCARLETT2_PORT_TYPE_SPDIF] = { > > /* S/PDIF outputs aren't available at 192KHz > > * but are included in the USB mux I/O > > * assignment message anyway > > @@ -411,21 +411,21 @@ static const struct scarlett2_device_info s18i20_gen2_info = { > > .src_num_offset = 1, > > .dst_descr = "S/PDIF Output %d Playback" > > }, > > - { > > + [SCARLETT2_PORT_TYPE_ADAT] = { > > .id = 0x200, > > .num = { 8, 8, 8, 4, 0 }, > > .src_descr = "ADAT %d", > > .src_num_offset = 1, > > .dst_descr = "ADAT Output %d Playback" > > }, > > - { > > + [SCARLETT2_PORT_TYPE_MIX] = { > > .id = 0x300, > > .num = { 10, 18, 18, 18, 18 }, > > .src_descr = "Mix %c", > > .src_num_offset = 65, > > .dst_descr = "Mixer Input %02d Capture" > > }, > > - { > > + [SCARLETT2_PORT_TYPE_PCM] = { > > .id = 0x600, > > .num = { 20, 18, 18, 14, 10 }, > > .src_descr = "PCM %d", > > -- > > 2.20.1 > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > https://mailman.alsa-project.org/mailman/listinfo/alsa-devel > _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel