summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_controller.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-03-09 08:42:00 +0100
committerTakashi Iwai <tiwai@suse.de>2015-03-09 08:42:00 +0100
commit4aa01c408b7022c620241b373d4c3707a2ebeab6 (patch)
tree25df2a7453ec3bf7fc82f2871756b4efd6d3d283 /sound/pci/hda/hda_controller.c
parentALSA: ac97: ac97_patch: Simplify patch_vt1613_specific() (diff)
parentALSA: hda - Fix regression of HD-audio controller fallback modes (diff)
downloadlinux-4aa01c408b7022c620241b373d4c3707a2ebeab6.tar.xz
linux-4aa01c408b7022c620241b373d4c3707a2ebeab6.zip
Merge branch 'for-linus' into for-next
Merging the HD-audio fixes back to base devel branch for further working on it.
Diffstat (limited to 'sound/pci/hda/hda_controller.c')
-rw-r--r--sound/pci/hda/hda_controller.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c
index f63d2cb55a82..2e73a59f3f71 100644
--- a/sound/pci/hda/hda_controller.c
+++ b/sound/pci/hda/hda_controller.c
@@ -1181,7 +1181,7 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
}
}
- if (!bus->no_response_fallback)
+ if (bus->no_response_fallback)
return -1;
if (!chip->polling_mode && chip->poll_count < 2) {