commit d3aee7996c30f928bbbbfd0994148e35d2e83084
author Russell King <rmk+kernel@arm.linux.org.uk> Fri Dec 18 17:48:40 2009 +0000
committer Takashi Iwai <tiwai@suse.de> Fri Dec 18 20:29:38 2009 +0100
tree d2c9ceabdeaebf406846c1918a7e97851225b213
parent 4e30b69108b20eca80f1a323f969bf7629c7795f

ALSA: AACI: factor common hw_params logic into aaci_pcm_hw_params

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

sound/arm/aaci.c

diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 2e28748..b88bbde 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -444,6 +444,11 @@
 					aacirun->pcm->r[0].slots);
 
 		aacirun->pcm_open = err == 0;
+		aacirun->cr = CR_FEN | CR_COMPACT | CR_SZ16;
+		aacirun->fifosz = aaci->fifosize * 4;
+
+		if (aacirun->cr & CR_COMPACT)
+			aacirun->fifosz >>= 1;
 	}
 
 	return err;
@@ -554,14 +559,9 @@
 	 * Enable FIFO, compact mode, 16 bits per sample.
 	 * FIXME: double rate slots?
 	 */
-	if (ret >= 0) {
-		aacirun->cr = CR_FEN | CR_COMPACT | CR_SZ16;
+	if (ret >= 0)
 		aacirun->cr |= channels_to_txmask[channels];
 
-		aacirun->fifosz	= aaci->fifosize * 4;
-		if (aacirun->cr & CR_COMPACT)
-			aacirun->fifosz >>= 1;
-	}
 	return ret;
 }
 
@@ -648,18 +648,10 @@
 	int ret;
 
 	ret = aaci_pcm_hw_params(substream, aacirun, params);
-
-	if (ret >= 0) {
-		aacirun->cr = CR_FEN | CR_COMPACT | CR_SZ16;
-
+	if (ret >= 0)
 		/* Line in record: slot 3 and 4 */
 		aacirun->cr |= CR_SL3 | CR_SL4;
 
-		aacirun->fifosz = aaci->fifosize * 4;
-
-		if (aacirun->cr & CR_COMPACT)
-			aacirun->fifosz >>= 1;
-	}
 	return ret;
 }