OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/qcom' into asoc-next

This commit is contained in:
Mark Brown 2017-11-10 21:30:56 +00:00
parent 40e8cc5689 20cf7e3ce3
commit 1cae41464c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/qcom/lpass-platform.c
View File

@ -74,7 +74,6 @@ static int lpass_platform_pcmops_open(struct snd_pcm_substream *substream)
data->i2s_port = cpu_dai->driver->id; data->i2s_port = cpu_dai->driver->id;
runtime->private_data = data; runtime->private_data = data;
dma_ch = 0;
if (v->alloc_dma_channel) if (v->alloc_dma_channel)
dma_ch = v->alloc_dma_channel(drvdata, dir); dma_ch = v->alloc_dma_channel(drvdata, dir);
else else
@ -122,7 +121,6 @@ static int lpass_platform_pcmops_close(struct snd_pcm_substream *substream)
struct lpass_pcm_data *data; struct lpass_pcm_data *data;
data = runtime->private_data; data = runtime->private_data;
v = drvdata->variant;
drvdata->substream[data->dma_ch] = NULL; drvdata->substream[data->dma_ch] = NULL;
if (v->free_dma_channel) if (v->free_dma_channel)
v->free_dma_channel(drvdata, data->dma_ch); v->free_dma_channel(drvdata, data->dma_ch);