aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-05-09 11:09:18 -0400
committerVinod Koul <vinod.koul@linux.intel.com>2012-07-12 23:43:08 -0400
commit6f3de8bf33902a91b83744c76fea7de3cd0328cc (patch)
tree4ae8b4defe335f6300e93c97f1dfb3cebd1315d7
parentd6fa5a4e7ab605370fd6c982782f84ef2e6660e7 (diff)
ASoC: siu: prepare for conversion to the shdma base library
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Liam Girdwood <lrg@ti.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
-rw-r--r--sound/soc/sh/siu_pcm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
index 5cfcc655e95f..3fdc801eb758 100644
--- a/sound/soc/sh/siu_pcm.c
+++ b/sound/soc/sh/siu_pcm.c
@@ -330,12 +330,12 @@ static bool filter(struct dma_chan *chan, void *slave)
330{ 330{
331 struct sh_dmae_slave *param = slave; 331 struct sh_dmae_slave *param = slave;
332 332
333 pr_debug("%s: slave ID %d\n", __func__, param->slave_id); 333 pr_debug("%s: slave ID %d\n", __func__, param->shdma_slave.slave_id);
334 334
335 if (unlikely(param->dma_dev != chan->device->dev)) 335 if (unlikely(param->dma_dev != chan->device->dev))
336 return false; 336 return false;
337 337
338 chan->private = param; 338 chan->private = &param->shdma_slave;
339 return true; 339 return true;
340} 340}
341 341
@@ -360,12 +360,12 @@ static int siu_pcm_open(struct snd_pcm_substream *ss)
360 if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) { 360 if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) {
361 siu_stream = &port_info->playback; 361 siu_stream = &port_info->playback;
362 param = &siu_stream->param; 362 param = &siu_stream->param;
363 param->slave_id = port ? pdata->dma_slave_tx_b : 363 param->shdma_slave.slave_id = port ? pdata->dma_slave_tx_b :
364 pdata->dma_slave_tx_a; 364 pdata->dma_slave_tx_a;
365 } else { 365 } else {
366 siu_stream = &port_info->capture; 366 siu_stream = &port_info->capture;
367 param = &siu_stream->param; 367 param = &siu_stream->param;
368 param->slave_id = port ? pdata->dma_slave_rx_b : 368 param->shdma_slave.slave_id = port ? pdata->dma_slave_rx_b :
369 pdata->dma_slave_rx_a; 369 pdata->dma_slave_rx_a;
370 } 370 }
371 371