diff options
| author |   Bard Liao <yung-chuan.liao@linux.intel.com> | 2019-05-27 00:58:33 +0800 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2019-05-28 07:52:02 +0200 |
| commit | bd2956e40edf2160f5c1a623d6d6c6ab7f8cd831 (patch) | |
| tree | 0b148708a82a3fea3d496d35b938a3e58d81d9b6 /sound/pci | |
| parent | ALSA: hda - Force polling mode on CNL for fixing codec communication (diff) | |
| download | wireguard-linux-bd2956e40edf2160f5c1a623d6d6c6ab7f8cd831.tar.xz wireguard-linux-bd2956e40edf2160f5c1a623d6d6c6ab7f8cd831.zip | |
ALSA: hda: assign polling_mode after azx_bus_init
We will move the polling_mode flag from struct azx to struct hdac_bus,
and the flag should be assigned after bus init.
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index a4b0414dda3b..489fb53c9b06 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1701,10 +1701,6 @@ 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) and CNL */ - if (IS_CFL(pci) || IS_CNL(pci)) - chip->polling_mode = 1; - err = azx_bus_init(chip, model[dev], &pci_hda_io_ops); if (err < 0) { kfree(hda); @@ -1712,6 +1708,10 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, return err; } + /* Workaround for a communication error on CFL (bko#199007) and CNL */ + if (IS_CFL(pci) || IS_CNL(pci)) + chip->polling_mode = 1; + if (chip->driver_type == AZX_DRIVER_NVIDIA) { dev_dbg(chip->card->dev, "Enable delay in RIRB handling\n"); chip->bus.needs_damn_long_delay = 1; |