Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a304edb4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: ASoC: Fix at32-pcm build breakage with PM enabled
parents cec5eb7b b1132b3d

sound/soc/at32/at32-pcm.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -434,7 +434,8 @@ static int at32_pcm_suspend(struct platform_device *pdev, 
	params = prtd->params;

	params = prtd->params;





	/* Disable the PDC and save the PDC registers */

	/* 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_xpr_save = ssc_readx(params->ssc->regs, params->pdc->xpr);

	prtd->pdc_xcr_save = ssc_readx(params->ssc->regs, params->pdc->xcr);

	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->xnpr, prtd->pdc_xnpr_save);

	ssc_writex(params->ssc->regs, params->pdc->xncr, prtd->pdc_xncr_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;

	return 0;

}

}

#else /* CONFIG_PM */

#else /* CONFIG_PM */