diff options
| author | Takashi Iwai | 2015-12-17 08:12:37 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2015-12-17 08:14:59 +0100 |
| commit | ef85f299c74e6c5dd98ec0230183be33f4c2813d (patch) | |
| tree | 76b7089f7eb1994b42ff0d8921f3ef4008099aaf /sound/pci/hda/hda_intel.c | |
| parent | Merge branch 'topic/firewire-update' into for-next (diff) | |
| download | kernel-qcow2-linux-ef85f299c74e6c5dd98ec0230183be33f4c2813d.tar.gz kernel-qcow2-linux-ef85f299c74e6c5dd98ec0230183be33f4c2813d.tar.xz kernel-qcow2-linux-ef85f299c74e6c5dd98ec0230183be33f4c2813d.zip | |
ALSA: hda - Merge RIRB_PRE_DELAY into CTX_WORKAROUND caps
AZX_DCAPS_RIRB_PRE_DELAY is always tied with AZX_DCAPS_CTX_WORKAROUND,
which is Creative's XFi specific. So, we can replace it and reduce
one more bit free for DCAPS.
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 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 56ef6b6fb546..2d2f14830df7 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2314,14 +2314,12 @@ static const struct pci_device_id azx_ids[] = { .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, .class_mask = 0xffffff, .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND | - AZX_DCAPS_NO_64BIT | - AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_POSFIX_LPIB }, + AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB }, #else /* this entry seems still valid -- i.e. without emu20kx chip */ { PCI_DEVICE(0x1102, 0x0009), .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND | - AZX_DCAPS_NO_64BIT | - AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_POSFIX_LPIB }, + AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB }, #endif /* CM8888 */ { PCI_DEVICE(0x13f6, 0x5011), |