Skip to contentSkip to conversation

ALSA fix

GIT PULL Takashi Iwai 1 participant 2 messages Sep 22, 2008 – Sep 23, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

please pull ALSA update for 2.6.27-rc7 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus

which contains the following trivial fix.

Thanks!

Takashi

==

Haavard Skinnemoen (1):
ALSA: ASoC: Fix at32-pcm build breakage with PM enabled

 sound/soc/at32/at32-pcm.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
sound/soc/at32/at32-pcm.c +3 -2
index 435f1da..c83584f 100644
@@ -434,7 +434,8 @@ static int at32_pcm_suspend(struct platform_device *pdev,
 	params = prtd->params;
 
 	/* Disable the PDC and save the PDC registers */
-	ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_disable);
+	ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR,
+		   params->mask->pdc_disable);
 
 	prtd->pdc_xpr_save = ssc_readx(params->ssc->regs, params->pdc->xpr);
 	prtd->pdc_xcr_save = ssc_readx(params->ssc->regs, params->pdc->xcr);
@@ -464,7 +465,7 @@ static int at32_pcm_resume(struct platform_device *pdev,
 	ssc_writex(params->ssc->regs, params->pdc->xnpr, prtd->pdc_xnpr_save);
 	ssc_writex(params->ssc->regs, params->pdc->xncr, prtd->pdc_xncr_save);
 
-	ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_enable);
+	ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR, params->mask->pdc_enable);
 	return 0;
 }
 #else /* CONFIG_PM */
#1 lore raw

[GIT PULL] ALSA fixes

Linus,

please pull ALSA updates for 2.6.27-rc7 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus

This contains a fix of MAINTAINERS in addition to the previous pending pull request. Both are obviously safe to apply.

Thanks!

Takashi

==

Haavard Skinnemoen (1):
ALSA: ASoC: Fix at32-pcm build breakage with PM enabled

Liam Girdwood (1):
ALSA: ASoC: maintainers - update email address for Liam Girdwood

 MAINTAINERS               |    3 ++-
 sound/soc/at32/at32-pcm.c |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)
MAINTAINERS +2 -1
index cad81a2..42ebbfd 100644
@@ -3833,11 +3833,12 @@ S:	Maintained
 
 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
 P:	Liam Girdwood
-M:	[email protected]
+M:	[email protected]
 P:	Mark Brown
 M:	[email protected]
 T:	git opensource.wolfsonmicro.com/linux-2.6-asoc
 L:	[email protected] (subscribers-only)
+W:	http://alsa-project.org/main/index.php/ASoC
 S:	Supported
 
 SPI SUBSYSTEM
sound/soc/at32/at32-pcm.c +3 -2
index 435f1da..c83584f 100644
@@ -434,7 +434,8 @@ static int at32_pcm_suspend(struct platform_device *pdev,
 	params = prtd->params;
 
 	/* Disable the PDC and save the PDC registers */
-	ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_disable);
+	ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR,
+		   params->mask->pdc_disable);
 
 	prtd->pdc_xpr_save = ssc_readx(params->ssc->regs, params->pdc->xpr);
 	prtd->pdc_xcr_save = ssc_readx(params->ssc->regs, params->pdc->xcr);
@@ -464,7 +465,7 @@ static int at32_pcm_resume(struct platform_device *pdev,
 	ssc_writex(params->ssc->regs, params->pdc->xnpr, prtd->pdc_xnpr_save);
 	ssc_writex(params->ssc->regs, params->pdc->xncr, prtd->pdc_xncr_save);
 
-	ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_enable);
+	ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR, params->mask->pdc_enable);
 	return 0;
 }
 #else /* CONFIG_PM */