diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2019-08-06 12:46:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-08-06 12:46:35 +0200 |
| commit | dae02c8c64937532466d95fdb6ead6ada8000673 (patch) | |
| tree | 1aa28cc48c37996a7e75aceb5f2430b7f0305127 /sound/pci/hda/hda_intel.c | |
| parent | ALSA: firewire-lib: localize kernel APIs to start/stop each AMDTP stream (diff) | |
| parent | ALSA: usb-audio: fix a memory leak bug (diff) | |
| download | linux-dev-dae02c8c64937532466d95fdb6ead6ada8000673.tar.xz linux-dev-dae02c8c64937532466d95fdb6ead6ada8000673.zip | |
Merge branch 'for-linus' into for-next
Pull 5.3 development branch for further fixes of USB-audio stuff.
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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 151f206e1c02..2af1e0868e55 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -318,11 +318,10 @@ enum { #define AZX_DCAPS_INTEL_SKYLAKE \ (AZX_DCAPS_INTEL_PCH_BASE | AZX_DCAPS_PM_RUNTIME |\ + AZX_DCAPS_SYNC_WRITE |\ AZX_DCAPS_SEPARATE_STREAM_TAG | AZX_DCAPS_I915_COMPONENT) -#define AZX_DCAPS_INTEL_BROXTON \ - (AZX_DCAPS_INTEL_PCH_BASE | AZX_DCAPS_PM_RUNTIME |\ - AZX_DCAPS_SEPARATE_STREAM_TAG | AZX_DCAPS_I915_COMPONENT) +#define AZX_DCAPS_INTEL_BROXTON AZX_DCAPS_INTEL_SKYLAKE /* quirks for ATI SB / AMD Hudson */ #define AZX_DCAPS_PRESET_ATI_SB \ |