From 18fece4f5484647be515ae4f8bc111ac213bf431 Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 18 Dec 2009 17:48:37 +0000 Subject: [PATCH] --- yaml --- r: 178111 b: refs/heads/master c: 4e30b69108b20eca80f1a323f969bf7629c7795f h: refs/heads/master i: 178109: fd398e5dd0988c0d575c2981ed86f7a0ce9305b5 178107: 0aa9c03d8025de9668e2700059e5264c024199e4 178103: 3b46fb47a77d40b0095554b19f571727aad83f7a 178095: 91816e3642bd3e08cbdcd613b088afb674163d46 178079: 587488ee0866cf11ed073cb821b6f8644952916a 178047: cffdf180fd64d27665eb4751dfb9b4eb0244c0d7 v: v3 --- [refs] | 2 +- trunk/sound/arm/aaci.c | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index eca8b6b9d332..6a2c314bb7ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ca867c827c84d21316e9dc4035abe9480f8347c +refs/heads/master: 4e30b69108b20eca80f1a323f969bf7629c7795f diff --git a/trunk/sound/arm/aaci.c b/trunk/sound/arm/aaci.c index ea3be874c84f..2e28748a3d8d 100644 --- a/trunk/sound/arm/aaci.c +++ b/trunk/sound/arm/aaci.c @@ -438,18 +438,14 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream, err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params)); - if (err < 0) - goto out; - - err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params), - params_channels(params), - aacirun->pcm->r[0].slots); - if (err) - goto out; + if (err >= 0) { + err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params), + params_channels(params), + aacirun->pcm->r[0].slots); - aacirun->pcm_open = 1; + aacirun->pcm_open = err == 0; + } - out: return err; } @@ -458,7 +454,7 @@ static int aaci_pcm_prepare(struct snd_pcm_substream *substream) struct snd_pcm_runtime *runtime = substream->runtime; struct aaci_runtime *aacirun = runtime->private_data; - aacirun->start = (void *)runtime->dma_area; + aacirun->start = runtime->dma_area; aacirun->end = aacirun->start + snd_pcm_lib_buffer_bytes(substream); aacirun->ptr = aacirun->start; aacirun->period =