From: Lars-Peter Clausen Subject: [PATCH 2/2] ASoC: cs4349: Don't use rtd->codec Date: Sun, 19 Jul 2015 12:15:18 +0200 Message-ID: <1437300918-4612-2-git-send-email-lars@metafoo.de> References: <1437300918-4612-1-git-send-email-lars@metafoo.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from smtp-out-068.synserver.de (smtp-out-068.synserver.de [212.40.185.68]) by alsa0.perex.cz (Postfix) with ESMTP id 49961260583 for ; Sun, 19 Jul 2015 12:15:29 +0200 (CEST) In-Reply-To: <1437300918-4612-1-git-send-email-lars@metafoo.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Mark Brown , Liam Girdwood Cc: Brian Austin , Lars-Peter Clausen , alsa-devel@alsa-project.org, Paul Handrigan , Tim Howe List-Id: alsa-devel@alsa-project.org rtd->codec does not necessarily point to the CODEC instance for which the callback was called (e.g. for CODEC<->CODEC or multi-CODEC links). Use dai->codec instead. Signed-off-by: Lars-Peter Clausen --- sound/soc/codecs/cs4349.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c index db18799..5101278 100644 --- a/sound/soc/codecs/cs4349.c +++ b/sound/soc/codecs/cs4349.c @@ -94,8 +94,7 @@ static int cs4349_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_codec *codec = rtd->codec; + struct snd_soc_codec *codec = dai->codec; struct cs4349_private *cs4349 = snd_soc_codec_get_drvdata(codec); int mode, fmt, ret; -- 2.1.4