On Thu, 2012-01-26 at 15:56 +0100, Guennadi Liakhovetski wrote:
Signed-off-by: Guennadi Liakhovetski g.liakhovetski@gmx.de
sound/soc/sh/siu_pcm.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index 0193e59..414bb35 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) { 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->simple_slave.slave_id);
if (unlikely(param->dma_dev != chan->device->dev)) return false;
- chan->private = param;
- chan->private = ¶m->simple_slave;
While at it, Can you fix the sh-mobile driver to NOT use chan->private?
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->simple_slave.slave_id = port ? pdata->dma_slave_tx_b : pdata->dma_slave_tx_a;
param->slave_id = port ? pdata->dma_slave_rx_b :
param->simple_slave.slave_id = port ? pdata->dma_slave_rx_b : pdata->dma_slave_rx_a;