aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-12-05 17:11:48 +1000
committerDave Airlie <airlied@redhat.com>2016-12-05 17:11:48 +1000
commitf03ee46be9401e3434f52bb15e92d1e640f76438 (patch)
treef0a1819bd3e44902578b80e1a03d1dde1c6099b8 /sound/soc
parentMerge tag 'tilcdc-4.10' of https://github.com/jsarha/linux into drm-next (diff)
parentLinux 4.9-rc8 (diff)
downloadwireguard-linux-f03ee46be9401e3434f52bb15e92d1e640f76438.tar.xz
wireguard-linux-f03ee46be9401e3434f52bb15e92d1e640f76438.zip
Backmerge tag 'v4.9-rc8' into drm-next
Linux 4.9-rc8 Daniel requested this so we could apply some follow on fixes cleanly to -next.
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/qcom/lpass-platform.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
index 07000f53db44..b392e51de94d 100644
--- a/sound/soc/qcom/lpass-platform.c
+++ b/sound/soc/qcom/lpass-platform.c
@@ -75,6 +75,7 @@ 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);
if (dma_ch < 0)