diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:37 +0100 |
| commit | 57648cd52b1848c6885bdbd948d113d52f3ddd43 (patch) | |
| tree | 218c74fde12577ea22f51eabcf4e8b65273edb54 /sound/arm | |
| parent | 79598324838a25cc378ecbb8c29dd1e3d3951d35 (diff) | |
| parent | fb716c0b7bed36064cd41d800c8f339f41adf084 (diff) | |
| download | kernel_samsung_aries-57648cd52b1848c6885bdbd948d113d52f3ddd43.zip kernel_samsung_aries-57648cd52b1848c6885bdbd948d113d52f3ddd43.tar.gz kernel_samsung_aries-57648cd52b1848c6885bdbd948d113d52f3ddd43.tar.bz2 | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/arm')
| -rw-r--r-- | sound/arm/aaci.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 1534f3d..1497dce 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -18,10 +18,7 @@ #include <linux/interrupt.h> #include <linux/err.h> #include <linux/amba/bus.h> - -#include <asm/io.h> -#include <asm/irq.h> -#include <asm/sizes.h> +#include <linux/io.h> #include <sound/core.h> #include <sound/initval.h> @@ -513,15 +510,9 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream, if (err < 0) goto out; - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params), - params_channels(params), - aacirun->pcm->r[0].slots); - else - err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params), - params_channels(params), - aacirun->pcm->r[0].slots); - + err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params), + params_channels(params), + aacirun->pcm->r[0].slots); if (err) goto out; @@ -537,7 +528,7 @@ static int aaci_pcm_prepare(struct snd_pcm_substream *substream) struct aaci_runtime *aacirun = runtime->private_data; aacirun->start = (void *)runtime->dma_area; - aacirun->end = aacirun->start + runtime->dma_bytes; + aacirun->end = aacirun->start + snd_pcm_lib_buffer_bytes(substream); aacirun->ptr = aacirun->start; aacirun->period = aacirun->bytes = frames_to_bytes(runtime, runtime->period_size); |