diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-09-06 11:04:03 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-09-06 11:04:15 +0200 |
| commit | 16c5cde20e304cd900371b140cd53ecafe8d3de5 (patch) | |
| tree | e1ece341f2ef3ac98069c3fcb350e16f0a8645bb /sound/pci/hda/hda_intel.c | |
| parent | 32eeeed963ad4f41b422b3e314d96ded7283b201 (diff) | |
| parent | 37137ec26c2c03039d8064c00f6eae176841ee0d (diff) | |
| download | linux-16c5cde20e304cd900371b140cd53ecafe8d3de5.tar.gz | |
Merge branch 'for-linus' into for-next
Once again back-merge the 6.0-rc devel branch for further USB-audio
and HD-audio developments.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index bf9df9bc8f1b..7e605ce43f41 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1810,7 +1810,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, /* use the non-cached pages in non-snoop mode */ if (!azx_snoop(chip)) - azx_bus(chip)->dma_type = SNDRV_DMA_TYPE_DEV_WC; + azx_bus(chip)->dma_type = SNDRV_DMA_TYPE_DEV_WC_SG; if (chip->driver_type == AZX_DRIVER_NVIDIA) { dev_dbg(chip->card->dev, "Enable delay in RIRB handling\n"); |