Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-3.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Just two small stable fixes: an HD-audio fix for the new Intel
chipsets and a PM handling fix in PCM dmaengine core"
* tag 'sound-3.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Fix onboard audio on Intel H97/Z97 chipsets
ALSA: pcm_dmaengine: Add check during device suspend
+9
+6
sound/core/pcm_dmaengine.c
+6
sound/core/pcm_dmaengine.c
···
182
182
int snd_dmaengine_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
183
183
{
184
184
struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
185
+
struct snd_pcm_runtime *runtime = substream->runtime;
185
186
int ret;
186
187
187
188
switch (cmd) {
···
197
196
dmaengine_resume(prtd->dma_chan);
198
197
break;
199
198
case SNDRV_PCM_TRIGGER_SUSPEND:
199
+
if (runtime->info & SNDRV_PCM_INFO_PAUSE)
200
+
dmaengine_pause(prtd->dma_chan);
201
+
else
202
+
dmaengine_terminate_all(prtd->dma_chan);
203
+
break;
200
204
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
201
205
dmaengine_pause(prtd->dma_chan);
202
206
break;
+3
sound/pci/hda/hda_intel.c
+3
sound/pci/hda/hda_intel.c
···
1743
1743
/* Lynx Point */
1744
1744
{ PCI_DEVICE(0x8086, 0x8c20),
1745
1745
.driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
1746
+
/* 9 Series */
1747
+
{ PCI_DEVICE(0x8086, 0x8ca0),
1748
+
.driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
1746
1749
/* Wellsburg */
1747
1750
{ PCI_DEVICE(0x8086, 0x8d20),
1748
1751
.driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },