From a41353441d19d6b3c8d0fa52da57206212062efe Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Wed, 9 May 2012 17:09:18 +0200 Subject: [PATCH] --- yaml --- r: 316658 b: refs/heads/master c: 6f3de8bf33902a91b83744c76fea7de3cd0328cc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/sh/siu_pcm.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 724953ba41b4..a44d875866bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6fa5a4e7ab605370fd6c982782f84ef2e6660e7 +refs/heads/master: 6f3de8bf33902a91b83744c76fea7de3cd0328cc diff --git a/trunk/sound/soc/sh/siu_pcm.c b/trunk/sound/soc/sh/siu_pcm.c index 5cfcc655e95f..3fdc801eb758 100644 --- a/trunk/sound/soc/sh/siu_pcm.c +++ b/trunk/sound/soc/sh/siu_pcm.c @@ -330,12 +330,12 @@ static bool filter(struct dma_chan *chan, void *slave) { struct sh_dmae_slave *param = slave; - pr_debug("%s: slave ID %d\n", __func__, param->slave_id); + 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 = param; + chan->private = ¶m->shdma_slave; return true; } @@ -360,12 +360,12 @@ static int siu_pcm_open(struct snd_pcm_substream *ss) if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) { siu_stream = &port_info->playback; param = &siu_stream->param; - param->slave_id = port ? pdata->dma_slave_tx_b : + param->shdma_slave.slave_id = port ? pdata->dma_slave_tx_b : pdata->dma_slave_tx_a; } else { siu_stream = &port_info->capture; param = &siu_stream->param; - param->slave_id = port ? pdata->dma_slave_rx_b : + param->shdma_slave.slave_id = port ? pdata->dma_slave_rx_b : pdata->dma_slave_rx_a; }