Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp5852386ybn; Sun, 29 Sep 2019 07:05:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqwiJEPHd+gNLZD7XrXnzqtelApGAyIKAaGZVwyPAGUNA6utwEhf7+pI2RR83thKWqx1APUd X-Received: by 2002:a17:906:fac5:: with SMTP id lu5mr15529031ejb.71.1569765952901; Sun, 29 Sep 2019 07:05:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569765952; cv=none; d=google.com; s=arc-20160816; b=U3kXXjPse8042e6Wszj4qAspfPAMMsy7WudfKxVCxlu3aOSX6syFQD74nXETEZ3dFO WOmbq1xogu5o3sLjzA3yInrKIJfOLUxyCFHIi8XGBo5uTvm9Yb4VCyKQYnpyzz76D+tM g624STOw7URBy34lrVjhdcf9vUutRal9M498Gck7pKQYCwgtWlQBi+FEnUnNp0eNNGXf F7TlWzqSson5ZagreQV+bL/lV7LaVvRtv6Xs9OhKqsx7O2nTEJe4Y9kCG8oU6/nJ4JXW FY7wWK4dYEcbDE2ef+sdgpFaTNWy+0XYXqzZ7pm7WAWnKk7s9Ux4OwIX68AyHJp/TSwz ZH6g== 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=TrUMqJEubC6sxkPVbkTgEDH+T2iohWUHx18Nofjl1GrJgjvrfiHvrgOVESl/PXSVlf S84hyuo9OSK620wAw1g5BdQhGY1qqhhlrW0VWQNtOXeVpNcQXofFnQ40haJiMkhjpEni zUXBc1hg+sb3VAVHclQeNQj9sIejxNvoq4j02lv/IpggPLhDHzcz8hAe47U4wdMqsr89 8Gu2ZPW1GVi5jvTqZq5eFxsrZDdlQ907/A3obVa9J8SNBDM7VxDd5ua/XDH+opfCM1kD PWtn6cFbcbtdWooJK6UdWnSFfawNSXnjg8XsydtRMNhxJ6kVDIVPoJwsd1Bg0NU8CY11 PjTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BWhelMvT; 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 x2si5509341ejd.126.2019.09.29.07.05.28; Sun, 29 Sep 2019 07:05:52 -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=BWhelMvT; 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 S1730137AbfI2OCC (ORCPT + 99 others); Sun, 29 Sep 2019 10:02:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:44412 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730109AbfI2OCA (ORCPT ); Sun, 29 Sep 2019 10:02:00 -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 94DF92082F; Sun, 29 Sep 2019 14:01:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569765718; bh=rg1m6UnFhcxOaDXtA3qfOIvCLZHYb3NhucEHI4MbCGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BWhelMvTNtgyKBXv8DxyVNJywFaZlqHZfoBM8fHPIuCUyDwgUDsT/bRWJFM2ZQyhO g5g9T+8QDEEsytTyLsNE93TUGrtvJvFZt/qej0J4r/muRbTCm+1tFquPL5xXPq24+w 60uHtW1feof1GJkMe9hF7i82M5m4iDeJ4PUIpxZA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Sakamoto , Takashi Iwai Subject: [PATCH 5.2 25/45] ALSA: dice: fix wrong packet parameter for Alesis iO26 Date: Sun, 29 Sep 2019 15:55:53 +0200 Message-Id: <20190929135031.279014406@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190929135024.387033930@linuxfoundation.org> References: <20190929135024.387033930@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. */ };