Merge remote-tracking branches 'asoc/fix/da7219-pops' and 'asoc/fix/qcom' into asoc...

[sfrench/cifs-2.6.git] / sound / soc / qcom / lpass-platform.c

diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
index 07000f53db44950d7f88ec3aab24fb12b9d302a6..420d200f9a0533bd335224784c2e7933a0c8c3b1 100644 (file)
--- a/sound/soc/qcom/lpass-platform.c
+++ b/sound/soc/qcom/lpass-platform.c
@@ -75,8 +75,12 @@ 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
+               dma_ch = 0;
+
        if (dma_ch < 0)
                return dma_ch;