diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-05-30 11:01:18 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-05-30 11:01:24 +0200 |
| commit | c86ccfba17289a7795e6bf8528c2824508fe86f8 (patch) | |
| tree | f294f69733caee28ecfede91467f4cfc71132ae9 /sound | |
| parent | 968e8e9fde25ae34afd7af7e5766776526b8c467 (diff) | |
| parent | ee8829dc609c5c4a425b4a65fbb4cd56fb82f1f4 (diff) | |
Merge branch 'topic/hda-polling-mode' into for-next
A follow-up fix for the HD-audio previous polling mode changes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/hda/hdac_controller.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c index a16ac31bda83..d6a91429c058 100644 --- a/sound/hda/hdac_controller.c +++ b/sound/hda/hdac_controller.c @@ -239,9 +239,9 @@ int snd_hdac_bus_get_response(struct hdac_bus *bus, unsigned int addr, timeout = jiffies + msecs_to_jiffies(1000); for (loopcounter = 0;; loopcounter++) { + spin_lock_irq(&bus->reg_lock); if (bus->polling_mode) snd_hdac_bus_update_rirb(bus); - spin_lock_irq(&bus->reg_lock); if (!bus->rirb.cmds[addr]) { if (res) *res = bus->rirb.res[addr]; /* the last value */ |