summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-11-10 21:30:56 +0000
committerMark Brown <broonie@kernel.org>2017-11-10 21:30:56 +0000
commit1cae41464ca8a1cced5ce00832f76e5881d2d23b (patch)
tree1c0e656e50f495399db83b70316713932a6bf53a /sound/soc
parent40e8cc568987a9b5620672f3d1d54a21848ae8d8 (diff)
parent20cf7e3ce3083593e163849ae6ba95525f2366ca (diff)
downloadlinux-1cae41464ca8a1cced5ce00832f76e5881d2d23b.tar.bz2
Merge remote-tracking branch 'asoc/topic/qcom' into asoc-next
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/qcom/lpass-platform.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
index e1945e1772cd..caf71aab8196 100644
--- a/sound/soc/qcom/lpass-platform.c
+++ b/sound/soc/qcom/lpass-platform.c
@@ -74,7 +74,6 @@ static int lpass_platform_pcmops_open(struct snd_pcm_substream *substream)
data->i2s_port = cpu_dai->driver->id;
runtime->private_data = data;
- dma_ch = 0;
if (v->alloc_dma_channel)
dma_ch = v->alloc_dma_channel(drvdata, dir);
else
@@ -122,7 +121,6 @@ static int lpass_platform_pcmops_close(struct snd_pcm_substream *substream)
struct lpass_pcm_data *data;
data = runtime->private_data;
- v = drvdata->variant;
drvdata->substream[data->dma_ch] = NULL;
if (v->free_dma_channel)
v->free_dma_channel(drvdata, data->dma_ch);