---

yaml --- r: 142719 b: refs/heads/master c: 488fe16 h: refs/heads/master i: 142717: a8ab9e9 142715: 5bf242f 142711: 3d3ff7c 142703: 0906903 142687: 39a6643 142655: 6d91014 142591: 9e5975a v: v3
git-mirror · Apr 7, 2009 · ecf8c65 · ecf8c65
1 parent 2d449e0
commit ecf8c65
Show file tree

Hide file tree

Showing 22 changed files with 95 additions and 980 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f9c510e9e18cd029e15190d35dd4271f2ef393b
+refs/heads/master: 488fe1665fd90f204fbc825b90060b9e0394e4be
diff --git a/trunk/Documentation/sound/alsa/soc/jack.txt b/trunk/Documentation/sound/alsa/soc/jack.txt
diff --git a/trunk/sound/arm/pxa2xx-ac97-lib.c b/trunk/sound/arm/pxa2xx-ac97-lib.c
@@ -238,8 +238,6 @@ static inline void pxa_ac97_cold_pxa3xx(void)
 
 bool pxa2xx_ac97_try_warm_reset(struct snd_ac97 *ac97)
 {
-	unsigned long gsr;
-
 #ifdef CONFIG_PXA25x
 	if (cpu_is_pxa25x())
 		pxa_ac97_warm_pxa25x();
@@ -256,10 +254,10 @@ bool pxa2xx_ac97_try_warm_reset(struct snd_ac97 *ac97)
 	else
 #endif
 		BUG();
-	gsr = GSR | gsr_bits;
-	if (!(gsr & (GSR_PCR | GSR_SCR))) {
+
+	if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR))) {
 		printk(KERN_INFO "%s: warm reset timeout (GSR=%#lx)\n",
-				 __func__, gsr);
+				 __func__, gsr_bits);
 
 		return false;
 	}
@@ -270,8 +268,6 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_try_warm_reset);
 
 bool pxa2xx_ac97_try_cold_reset(struct snd_ac97 *ac97)
 {
-	unsigned long gsr;
-
 #ifdef CONFIG_PXA25x
 	if (cpu_is_pxa25x())
 		pxa_ac97_cold_pxa25x();
@@ -289,10 +285,9 @@ bool pxa2xx_ac97_try_cold_reset(struct snd_ac97 *ac97)
 #endif
 		BUG();
 
-	gsr = GSR | gsr_bits;
-	if (!(gsr & (GSR_PCR | GSR_SCR))) {
+	if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR))) {
 		printk(KERN_INFO "%s: cold reset timeout (GSR=%#lx)\n",
-				 __func__, gsr);
+				 __func__, gsr_bits);
 
 		return false;
 	}

diff --git a/trunk/sound/atmel/abdac.c b/trunk/sound/atmel/abdac.c
@@ -165,7 +165,7 @@ static struct snd_pcm_hardware atmel_abdac_hw = {
 	.buffer_bytes_max	= 64 * 4096,
 	.period_bytes_min	= 4096,
 	.period_bytes_max	= 4096,
-	.periods_min		= 6,
+	.periods_min		= 4,
 	.periods_max		= 64,
 };
 
@@ -502,7 +502,7 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, card);
 
 	dev_info(&pdev->dev, "Atmel ABDAC at 0x%p using %s\n",
-			dac->regs, dev_name(&dac->dma.chan->dev->device));
+			dac->regs, dac->dma.chan->dev->device.bus_id);
 
 	return retval;