sound fixes for 3.15-rc8
Subsystems (2)
Linus,
please pull sound fixes for v3.15-rc8 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.15-rc8
The topmost commit is 77f07800cb456bed6e5c345e6e4e83e8eda62437
----------------------------------------------------------------
sound fixes for 3.15-rc8
Just two small stable fixes: an HD-audio fix for the new Intel chipsets and a PM handling fix in PCM dmaengine core.
----------------------------------------------------------------
Takashi Iwai (1):
ALSA: hda - Fix onboard audio on Intel H97/Z97 chipsets
Tushar Behera (1):
ALSA: pcm_dmaengine: Add check during device suspend
--- sound/core/pcm_dmaengine.c | 6 ++++++ sound/pci/hda/hda_intel.c | 3 +++ 2 files changed, 9 insertions(+)
sound/core/pcm_dmaengine.c +6 -0
@@ -182,6 +182,7 @@ static int dmaengine_pcm_prepare_and_submit(struct snd_pcm_substream *substream)int snd_dmaengine_pcm_trigger (struct snd_pcm_substream *substream,int cmd) {struct dmaengine_pcm_runtime_data *prtd =substream_to_prtd (substream); +struct snd_pcm_runtime *runtime = substream->runtime;int ret;switch (cmd) {
@@ -196,6 +197,11 @@ int snd_dmaengine_pcm_trigger(struct snd_pcm_substream *substream, int cmd)dmaengine_resume (prtd->dma_chan);break ;case SNDRV_PCM_TRIGGER_SUSPEND : +if (runtime->info &SNDRV_PCM_INFO_PAUSE ) +dmaengine_pause (prtd->dma_chan); +else +dmaengine_terminate_all (prtd->dma_chan); +break ;case SNDRV_PCM_TRIGGER_PAUSE_PUSH :dmaengine_pause (prtd->dma_chan);break ;
sound/pci/hda/hda_intel.c +3 -0
@@ -1743,6 +1743,9 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {/* Lynx Point */ { PCI_DEVICE(0x8086, 0x8c20), .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, + /* 9 Series */ + { PCI_DEVICE(0x8086, 0x8ca0), + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, /* Wellsburg */ { PCI_DEVICE(0x8086, 0x8d20), .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },