summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8580.c
diff options
context:
space:
mode:
authorMark Brown2014-03-23 15:00:47 +0100
committerMark Brown2014-03-23 15:00:47 +0100
commitf928badf5e58195af2ae3a457da35190d10ace48 (patch)
treeb3cf42e3aa815464a4b2da0508c6b12f246768b0 /sound/soc/codecs/wm8580.c
parentMerge remote-tracking branch 'asoc/topic/core' into asoc-next (diff)
parentASoC: codecs: Replace instances of rtd->codec with dai->codec (diff)
downloadkernel-qcow2-linux-f928badf5e58195af2ae3a457da35190d10ace48.tar.gz
kernel-qcow2-linux-f928badf5e58195af2ae3a457da35190d10ace48.tar.xz
kernel-qcow2-linux-f928badf5e58195af2ae3a457da35190d10ace48.zip
Merge remote-tracking branch 'asoc/topic/codecs' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8580.c')
-rw-r--r--sound/soc/codecs/wm8580.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 7558c838193d..af7ed8b5d4e1 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -504,8 +504,7 @@ static int wm8580_paif_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 wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec);
u16 paifa = 0;
u16 paifb = 0;