Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/topic/qcom' into asoc-next
Browse files Browse the repository at this point in the history
  • Loading branch information
broonie committed Nov 10, 2017
2 parents 40e8cc5 + 20cf7e3 commit 1cae414
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions sound/soc/qcom/lpass-platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 1cae414

Please sign in to comment.