diff options
author | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:22:08 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:22:08 +0800 |
commit | 877c2196bf43e410b8b1a66c7bbf7d5cb98a9f41 (patch) | |
tree | f74b6a59cd223c470830b3e4f3e1b6a4270abc1a /sound/pci/hda/hda_intel.c | |
parent | b95b6a6ddfae1513893676e444f585a106513688 (diff) | |
parent | 2dad587ec1dddf02a00d3b54156337a6dc79a752 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlinux-linaro-lsk-v3.14-android
Conflicts:
net/netfilter/xt_socket.c
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 2f3059b50ffa..84e8879cc372 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -959,7 +959,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) { |