Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp5844915ybn; Sun, 29 Sep 2019 06:59:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqwW282RaOdLhsoJBf5sIPsXLiUMz0C7kuxGJD7LbKTx67Sj4PS1Na1R+Ix0/XClQMmpcbv0 X-Received: by 2002:a50:9512:: with SMTP id u18mr14490957eda.182.1569765557234; Sun, 29 Sep 2019 06:59:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569765557; cv=none; d=google.com; s=arc-20160816; b=SP/y2WBplpbRhCZJGPs/B0w+/PTIxsCbHHJQc9g6NHjEULEyEJVkeT62oIZ+LXHCl5 g+tuGFZ97a8PpgH5bBxlIvlOczxyL/usM5PyjTcI40A/7+dbXTi0j9Zp7EljpDfgZ7gQ WZ6c3sIPF3OLWKa6dssSsVNHFGEYjSIuuoXm7qSym9/KMgmbEEkI+sh63a32IQG+8peh r5SJMAgsIxBxmZTnYehnlmjCvWjwPLCopgDWYMei2ai5CSqej0C27q86PuPpARxUI1bt otcvtFDNvPmV0vKIAK6cD6JTOwCv9/KCCFc2QtPfKYUncC25KVH1ZA/eDf6kaEf7mDiG pNbA== 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=CMXkhIE+QyqGqpOLk3zkLW0ZEW2UqGFm8NXEBxwvTi4=; b=ySljpC08kRIPQpM4SGlGx1aU/PsAMfx4GL+D2DKivkErdwBdd6CqEtQvSL+vR2nhPd xYeaPwC5EeDLfCuW0MQSWsidCBzF/j9uDY3xAYCyyuNYLqdBUcCtH1Tl9TUhneMdqKPt omF1pV4xARPg/axa6ZEwlVXGK/s8KCnN+mxa8XHpf7y8z2xVrulEX3TU4vhyY2t9tqpe W5ABfTRL84K5O3Ze3iKJwyXG6OGlzhe7bmp8aSj17ruOK2HsUrWnjfDgnUhn1F9iDj2n iM9T8JCtxETyLS7JXAVekPAlRU4njr5sjqBaEbr9JFDLFM+tB9Ty7ZKC//wNk9Ng+y4I L29A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=g1sANutf; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h4si6178593edd.189.2019.09.29.06.58.53; Sun, 29 Sep 2019 06:59:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=g1sANutf; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729344AbfI2N5v (ORCPT + 99 others); Sun, 29 Sep 2019 09:57:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:38230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729294AbfI2N5u (ORCPT ); Sun, 29 Sep 2019 09:57:50 -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 6BF9D2082F; Sun, 29 Sep 2019 13:57:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569765469; bh=rg1m6UnFhcxOaDXtA3qfOIvCLZHYb3NhucEHI4MbCGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g1sANutfeq//BPcaW4NuU4UescoI451wxXPYOZ7dEFysYP60DuYclgaeW71zFT584 PRFixTuJAOIZtlroJz++JdMnCSsoPWXFn7llmYdRrKvA1DHUYiJNv2bbI/FwOn5xLM RTGWWNdTOfY5e+UMdE/6OEqAtDOR6UwcS4deQBwE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Sakamoto , Takashi Iwai Subject: [PATCH 4.19 29/63] ALSA: dice: fix wrong packet parameter for Alesis iO26 Date: Sun, 29 Sep 2019 15:54:02 +0200 Message-Id: <20190929135037.464204080@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190929135031.382429403@linuxfoundation.org> References: <20190929135031.382429403@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 3a9236e97207f2469254b4098995159b80174d95 upstream. At higher sampling rate (e.g. 192.0 kHz), Alesis iO26 transfers 4 data channels per data block in CIP. Both iO14 and iO26 have the same contents in their configuration ROM. For this reason, ALSA Dice driver attempts to distinguish them according to the value of TX0_AUDIO register at probe callback. Although the way is valid at lower and middle sampling rate, it's lastly invalid at higher sampling rate because because the two models returns the same value for read transaction to the register. In the most cases, users just plug-in the device and ALSA dice driver detects it. In the case, the device runs at lower sampling rate and the driver detects expectedly. For this reason, this commit leaves the way to detect as is. Fixes: 28b208f600a3 ("ALSA: dice: add parameters of stream formats for models produced by Alesis") Cc: # v4.18+ Signed-off-by: Takashi Sakamoto Link: https://lore.kernel.org/r/20190916101851.30409-1-o-takashi@sakamocchi.jp Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/firewire/dice/dice-alesis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/firewire/dice/dice-alesis.c +++ b/sound/firewire/dice/dice-alesis.c @@ -15,7 +15,7 @@ alesis_io14_tx_pcm_chs[MAX_STREAMS][SND_ static const unsigned int alesis_io26_tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT] = { - {10, 10, 8}, /* Tx0 = Analog + S/PDIF. */ + {10, 10, 4}, /* Tx0 = Analog + S/PDIF. */ {16, 8, 0}, /* Tx1 = ADAT1 + ADAT2. */ };