From 5465273072731f435f82cca609859d07d1ccde1b Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 5 Jul 2012 12:29:38 +0200 Subject: [PATCH] --- yaml --- r: 316667 b: refs/heads/master c: 9d051dc79f8fd1854229178476db0534359a3704 h: refs/heads/master i: 316665: 307b5a7112095ccd71dfc6ee6dd67ed5b76128bd 316663: 611112396dd8f340ec1344af48954d1272e5aad0 v: v3 --- [refs] | 2 +- trunk/sound/soc/sh/siu_pcm.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9a69f5205c85..fb07047c10e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 341f4dc5dcecbf60f038055db177845b9af480ed +refs/heads/master: 9d051dc79f8fd1854229178476db0534359a3704 diff --git a/trunk/sound/soc/sh/siu_pcm.c b/trunk/sound/soc/sh/siu_pcm.c index 3fdc801eb758..488f9becb44f 100644 --- a/trunk/sound/soc/sh/siu_pcm.c +++ b/trunk/sound/soc/sh/siu_pcm.c @@ -332,9 +332,6 @@ static bool filter(struct dma_chan *chan, void *slave) pr_debug("%s: slave ID %d\n", __func__, param->shdma_slave.slave_id); - if (unlikely(param->dma_dev != chan->device->dev)) - return false; - chan->private = ¶m->shdma_slave; return true; } @@ -369,7 +366,6 @@ static int siu_pcm_open(struct snd_pcm_substream *ss) pdata->dma_slave_rx_a; } - param->dma_dev = pdata->dma_dev; /* Get DMA channel */ siu_stream->chan = dma_request_channel(mask, filter, param); if (!siu_stream->chan) {