diff options
author | Mark Brown <broonie@kernel.org> | 2017-11-10 16:30:56 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-11-10 16:30:56 -0500 |
commit | 1cae41464ca8a1cced5ce00832f76e5881d2d23b (patch) | |
tree | 1c0e656e50f495399db83b70316713932a6bf53a | |
parent | 40e8cc568987a9b5620672f3d1d54a21848ae8d8 (diff) | |
parent | 20cf7e3ce3083593e163849ae6ba95525f2366ca (diff) |
Merge remote-tracking branch 'asoc/topic/qcom' into asoc-next
-rw-r--r-- | sound/soc/qcom/lpass-platform.c | 2 |
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) | |||
74 | data->i2s_port = cpu_dai->driver->id; | 74 | data->i2s_port = cpu_dai->driver->id; |
75 | runtime->private_data = data; | 75 | runtime->private_data = data; |
76 | 76 | ||
77 | dma_ch = 0; | ||
78 | if (v->alloc_dma_channel) | 77 | if (v->alloc_dma_channel) |
79 | dma_ch = v->alloc_dma_channel(drvdata, dir); | 78 | dma_ch = v->alloc_dma_channel(drvdata, dir); |
80 | else | 79 | else |
@@ -122,7 +121,6 @@ static int lpass_platform_pcmops_close(struct snd_pcm_substream *substream) | |||
122 | struct lpass_pcm_data *data; | 121 | struct lpass_pcm_data *data; |
123 | 122 | ||
124 | data = runtime->private_data; | 123 | data = runtime->private_data; |
125 | v = drvdata->variant; | ||
126 | drvdata->substream[data->dma_ch] = NULL; | 124 | drvdata->substream[data->dma_ch] = NULL; |
127 | if (v->free_dma_channel) | 125 | if (v->free_dma_channel) |
128 | v->free_dma_channel(drvdata, data->dma_ch); | 126 | v->free_dma_channel(drvdata, data->dma_ch); |