Commit f2159d1e99612ceb94bf9a2dc2fbca409d828b1b
Exists in
ti-lsk-linux-4.1.y
and in
12 other branches
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
Showing 2 changed files Side-by-side Diff
sound/core/pcm_dmaengine.c
| ... | ... | @@ -182,6 +182,7 @@ |
| 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) { |
| ... | ... | @@ -196,6 +197,11 @@ |
| 196 | 197 | dmaengine_resume(prtd->dma_chan); |
| 197 | 198 | break; |
| 198 | 199 | case SNDRV_PCM_TRIGGER_SUSPEND: |
| 200 | + if (runtime->info & SNDRV_PCM_INFO_PAUSE) | |
| 201 | + dmaengine_pause(prtd->dma_chan); | |
| 202 | + else | |
| 203 | + dmaengine_terminate_all(prtd->dma_chan); | |
| 204 | + break; | |
| 199 | 205 | case SNDRV_PCM_TRIGGER_PAUSE_PUSH: |
| 200 | 206 | dmaengine_pause(prtd->dma_chan); |
| 201 | 207 | break; |
sound/pci/hda/hda_intel.c
| ... | ... | @@ -1743,6 +1743,9 @@ |
| 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 }, |