From patchwork Sun May 27 01:13:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Sakamoto X-Patchwork-Id: 10429271 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6D03D60225 for ; Sun, 27 May 2018 01:14:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D57C28D75 for ; Sun, 27 May 2018 01:14:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4FA0328E2C; Sun, 27 May 2018 01:14:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0245E28D75 for ; Sun, 27 May 2018 01:14:27 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id B10962676AD; Sun, 27 May 2018 03:14:12 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id C2FAC267196; Sun, 27 May 2018 03:14:08 +0200 (CEST) Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by alsa0.perex.cz (Postfix) with ESMTP id 9FB2A2670BE for ; Sun, 27 May 2018 03:14:06 +0200 (CEST) Received: by mail-pl0-f65.google.com with SMTP id ay10-v6so5220878plb.1 for ; Sat, 26 May 2018 18:14:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=voW5qU1w9qrlPyXgKTQfT6s82wjWnr3I5l2NGVyEyeE=; b=gWhC+mrl9u+K5a3g3rsmfVYx5Y+IjubRrA4uUGBfHpI/lf7aXz9IH3kL4NFGWfFbg0 4AbXwtb1rCAYBd8LhMgl71qgzh/c8XpmXEE+jaXNm/jUQZz8SXO1LkA4loXMc2eHewaU 3wZz4f4rHYePQ75TGH50armqKkTyCzc06NWidgcm2ahe9tU771KpZkF18J+rice5Y1yp 23A734fiOUn73YZCpqUXXQ9yCPKAuwU+DoKWR5ypf/RaZ7H6neSa7jbYP1kS98MzSDX6 VEbQwkX6BqS/IAP7NAIwD2bW5GwV2RDIUWyGJFI3oZYCjNN6Q7EMjSQj657XKK8p3dFR C9OA== X-Gm-Message-State: ALKqPweYWemeKsW9HcidD2CM8J1s5KRvmIxFrxs2Z3kj/c0b93vpzRh0 1A561VAKb+3xKgyqFgypWyY= X-Google-Smtp-Source: AB8JxZpZrfs3odZ9pKShdG8xngs5WCQe3d+u5ZdCmxoBuJ+x3prME1majYYCeERs+haL+XXv65dg4A== X-Received: by 2002:a17:902:b907:: with SMTP id bf7-v6mr8318131plb.331.1527383644966; Sat, 26 May 2018 18:14:04 -0700 (PDT) Received: from localhost.localdomain (i196238.dynamic.ppp.asahi-net.or.jp. [61.125.196.238]) by smtp.gmail.com with ESMTPSA id c8-v6sm43117742pfi.96.2018.05.26.18.14.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 May 2018 18:14:03 -0700 (PDT) From: Takashi Sakamoto To: clemens@ladisch.de, tiwai@suse.de Date: Sun, 27 May 2018 10:13:30 +0900 Message-Id: <20180527011330.9817-3-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180527011330.9817-1-o-takashi@sakamocchi.jp> References: <20180527011330.9817-1-o-takashi@sakamocchi.jp> Cc: alsa-devel@alsa-project.org, ffado-devel@lists.sourceforge.net Subject: [alsa-devel] [PATCH 2/2] ALSA: dice: unuse second stream for MIDI conformant data channel for TC Electronic models X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP At present, all of models produced by TC Electronic except for Konnekt Live are supported with hard-coded their stream formats. Studio Konnekt 48 is sore model to support dual streams for both directions. The second stream has no MIDI conformant data channel in its data block. But current implementation transfers the second stream with MIDI conformant data channel. This commit fixes this issue. Signed-off-by: Takashi Sakamoto --- sound/firewire/dice/dice-tcelectronic.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/firewire/dice/dice-tcelectronic.c b/sound/firewire/dice/dice-tcelectronic.c index a4cbe2da8c15..a8875d24ba2a 100644 --- a/sound/firewire/dice/dice-tcelectronic.c +++ b/sound/firewire/dice/dice-tcelectronic.c @@ -95,11 +95,9 @@ int snd_dice_detect_tcelectronic_formats(struct snd_dice *dice) memcpy(dice->rx_pcm_chs, entry->spec->rx_pcm_chs, MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int)); - for (i = 0; i < MAX_STREAMS; ++i) { - if (entry->spec->has_midi) { - dice->tx_midi_ports[i] = 1; - dice->rx_midi_ports[i] = 1; - } + if (entry->spec->has_midi) { + dice->tx_midi_ports[0] = 1; + dice->rx_midi_ports[0] = 1; } return 0;