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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 B102CC33CAF for ; Thu, 16 Jan 2020 17:26:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B0C4246C8 for ; Thu, 16 Jan 2020 17:26:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195610; bh=dPFKh4qxVWxL82ZXRTuZo2RFzaWXENsX8DRPcBi7jD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=etnqaGD/xlW0g1zSOCZpRZYsiMCrNVMJFVNcnBtVtOqpojXLkcjDHdzgy3eMkFZ6f lgqFpkh3DT+IHHTXyJQBdfh6zhZhxuphZ+HjDPi7LnBKnmhgHZNmgdFK+rNHlEk6HH JQ6o7aI8LDpyhbuhIShHotU/DaFfgkayZnMu+qyE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392306AbgAPR0t (ORCPT ); Thu, 16 Jan 2020 12:26:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:35732 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404015AbgAPR0m (ORCPT ); Thu, 16 Jan 2020 12:26:42 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4AF99246BE; Thu, 16 Jan 2020 17:26:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195602; bh=dPFKh4qxVWxL82ZXRTuZo2RFzaWXENsX8DRPcBi7jD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WUYZquyReQ4zSd5K0pphmIcFyQdLepVPpa8peD2uEBVQSj/5e22s5H/VG9K2RO7JP uEUOrUU0+44sW8cGe34osTOfrxPSNL/vMTrSfM1vMWJrt7HMqG8yo7FkBSsd7Fbwkz wU83SI8sUPjO6WRMlAa/DP6v7vpn6a3/SW0Jq940= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jerome Brunet , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 4.14 177/371] ASoC: fix valid stream condition Date: Thu, 16 Jan 2020 12:20:49 -0500 Message-Id: <20200116172403.18149-120-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116172403.18149-1-sashal@kernel.org> References: <20200116172403.18149-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jerome Brunet [ Upstream commit 6a7c59c6d9f3b280e81d7a04bbe4e55e90152dce ] A stream may specify a rate range using 'rate_min' and 'rate_max', so a stream may be valid and not specify any rates. However, as stream cannot be valid and not have any channel. Let's use this condition instead to determine if a stream is valid or not. Fixes: cde79035c6cf ("ASoC: Handle multiple codecs with split playback / capture") Signed-off-by: Jerome Brunet Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 24047375c2fb..70e1a60a2e98 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -48,8 +48,8 @@ static bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream) else codec_stream = &dai->driver->capture; - /* If the codec specifies any rate at all, it supports the stream. */ - return codec_stream->rates; + /* If the codec specifies any channels at all, it supports the stream */ + return codec_stream->channels_min; } /** -- 2.20.1