diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-03-23 22:02:24 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-03-23 22:03:29 +0100 |
| commit | 3446b1e962b387b8cec53e85fdd9392da25a2737 (patch) | |
| tree | 909bc89c653b5677a457372e745ef322cb63ed20 /sound/pci/hda/hda_intel.c | |
| parent | 21e9b3e931f78497b19b1f8f3d59d19412c1a28f (diff) | |
| parent | b00214865d65100163574ba250008f182cf90869 (diff) | |
Merge branch 'for-linus' into for-next
Back-merge for applying more series of fixes for USB DSD support.
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, 5 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index d54988f79301..ccffce068634 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -375,6 +375,7 @@ enum { ((pci)->device == 0x160c)) #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) +#define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348) static char *driver_short_names[] = { [AZX_DRIVER_ICH] = "HDA Intel", @@ -1744,6 +1745,10 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, else chip->bdl_pos_adj = bdl_pos_adj[dev]; + /* Workaround for a communication error on CFL (bko#199007) */ + if (IS_CFL(pci)) + chip->polling_mode = 1; + err = azx_bus_init(chip, model[dev], &pci_hda_io_ops); if (err < 0) { kfree(hda); |