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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 9E405C35242 for ; Fri, 24 Jan 2020 09:56:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 732A020718 for ; Fri, 24 Jan 2020 09:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859793; bh=Wyt7kKObs3IeoCChhvP5yUkQWJnhvUrcliU7CHUkkbE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=h0lpLDwU2eR1cDALod/6y0RYjb+Kxn687/+wg3JeJsH9E/d3uia2Jha9KxMMs/vsJ 0wzC0s+iCgUB0+Tt4i0ZmxeqhZTAdENSDPEzjzVrmYP0hxqsWRUegljlXVWyh3y9z6 p7hwZmzDoRgzw9vg2d3U6p+1B/oQ8lfju0OphNUk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388392AbgAXJ4c (ORCPT ); Fri, 24 Jan 2020 04:56:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:60256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731098AbgAXJ4c (ORCPT ); Fri, 24 Jan 2020 04:56:32 -0500 Received: from localhost (unknown [145.15.244.15]) (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 A6DD120718; Fri, 24 Jan 2020 09:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859791; bh=Wyt7kKObs3IeoCChhvP5yUkQWJnhvUrcliU7CHUkkbE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qu45g/qzuvXUw5iA5UOXSv04OXU4s6Rs17Ph2yfXpt6c/jlaeH8jjz4LzhtGtPb9V x/YGUa8tM171RF553bFdfj2LpmIDFUcqUiQNe3AVc0l5nrA6maaae6p2Tcgz7BueDM jeRFCbgnj+tFbz+e84OUnapVI8g6XmHMj8p5L5ik= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerome Brunet , Mark Brown , Sasha Levin Subject: [PATCH 4.14 183/343] ASoC: fix valid stream condition Date: Fri, 24 Jan 2020 10:30:01 +0100 Message-Id: <20200124092944.102585804@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 24047375c2fbb..70e1a60a2e980 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