diff options
Diffstat (limited to 'sound/soc/sh/siu_pcm.c')
-rw-r--r-- | sound/soc/sh/siu_pcm.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index ba7f8d05d977..36170be15aa7 100644 --- a/sound/soc/sh/siu_pcm.c +++ b/sound/soc/sh/siu_pcm.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
27 | #include <linux/slab.h> | ||
28 | 27 | ||
29 | #include <sound/control.h> | 28 | #include <sound/control.h> |
30 | #include <sound/core.h> | 29 | #include <sound/core.h> |
@@ -32,7 +31,6 @@ | |||
32 | #include <sound/pcm_params.h> | 31 | #include <sound/pcm_params.h> |
33 | #include <sound/soc-dai.h> | 32 | #include <sound/soc-dai.h> |
34 | 33 | ||
35 | #include <asm/dmaengine.h> | ||
36 | #include <asm/siu.h> | 34 | #include <asm/siu.h> |
37 | 35 | ||
38 | #include "siu.h" | 36 | #include "siu.h" |
@@ -359,13 +357,13 @@ static int siu_pcm_open(struct snd_pcm_substream *ss) | |||
359 | if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) { | 357 | if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) { |
360 | siu_stream = &port_info->playback; | 358 | siu_stream = &port_info->playback; |
361 | param = &siu_stream->param; | 359 | param = &siu_stream->param; |
362 | param->slave_id = port ? SHDMA_SLAVE_SIUB_TX : | 360 | param->slave_id = port ? pdata->dma_slave_tx_b : |
363 | SHDMA_SLAVE_SIUA_TX; | 361 | pdata->dma_slave_tx_a; |
364 | } else { | 362 | } else { |
365 | siu_stream = &port_info->capture; | 363 | siu_stream = &port_info->capture; |
366 | param = &siu_stream->param; | 364 | param = &siu_stream->param; |
367 | param->slave_id = port ? SHDMA_SLAVE_SIUB_RX : | 365 | param->slave_id = port ? pdata->dma_slave_rx_b : |
368 | SHDMA_SLAVE_SIUA_RX; | 366 | pdata->dma_slave_rx_a; |
369 | } | 367 | } |
370 | 368 | ||
371 | param->dma_dev = pdata->dma_dev; | 369 | param->dma_dev = pdata->dma_dev; |