From patchwork Tue Jan 28 14:04:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232661 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 9952DC2D0DB for ; Tue, 28 Jan 2020 14:19:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D5642071E for ; Tue, 28 Jan 2020 14:19:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221190; bh=+i9riZwgAlitsQK1UdlrrNHwVbuIjA51i/mTjN7k/Aw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j61TenRHOQa670HS3BKOj0FR5By5lqYJDyGDmQn6jkMS4X7orkoIfgg4upwsy3cNe KqiENHfNDaMdMOQ836/jCiiAQNmGAFYQ3COjqHi7bxA3DqKfocMneqXQ/mav2eOOuJ jdKvvNJLmsaIpEG8rJxzI0dUGIKeLKFthzl9L1xU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730940AbgA1OTt (ORCPT ); Tue, 28 Jan 2020 09:19:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:44336 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730525AbgA1OTs (ORCPT ); Tue, 28 Jan 2020 09:19:48 -0500 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 113542071E; Tue, 28 Jan 2020 14:19:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221188; bh=+i9riZwgAlitsQK1UdlrrNHwVbuIjA51i/mTjN7k/Aw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HJRkTd98yUjv5f9cWl8N+Zy87omhsXw9N7FtUI2NTIIYEqZaOVFaw1ENXluMCpRLU Y4wDUhmnyqS1Gjv905d7hpG24QJVnQyDG6fCol1RLYBkS+fNSu7/z8wLtq3beWNG8k woIkmZlKaasT1PwV+HQ/dIFxIHe3SG/zjZUHN1lQ= 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.9 125/271] ASoC: fix valid stream condition Date: Tue, 28 Jan 2020 15:04:34 +0100 Message-Id: <20200128135901.900320837@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135852.449088278@linuxfoundation.org> References: <20200128135852.449088278@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 d69559e458725..635b22fa1101a 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; } /**