aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2014-10-24 10:00:38 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-30 09:40:17 -0700
commitb8758f7d0a2e22af974abfd7666dcef8ffc3b89c (patch)
treeb02094cc40f20360aed4db6d36c6717e29e4d93e
parent0dfdfc1126ff9b60159a1dce9788c5960ad75958 (diff)
downloadlinux-linaro-stable-b8758f7d0a2e22af974abfd7666dcef8ffc3b89c.tar.gz
ALSA: hda - Add missing terminating entry to SND_HDA_PIN_QUIRK macro
commit fb54a645b2739fb196446ffbbbe3f3589d117b55 upstream. Without this terminating entry, the pin matching would continue across random memory until a zero or a non-matching entry was found. The result being that in some cases, the pin quirk would not be applied correctly. Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/pci/hda/hda_local.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 4e2d4863daa1..cb06a553b9d9 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -424,7 +424,7 @@ struct snd_hda_pin_quirk {
.subvendor = _subvendor,\
.name = _name,\
.value = _value,\
- .pins = (const struct hda_pintbl[]) { _pins } \
+ .pins = (const struct hda_pintbl[]) { _pins, {0, 0}} \
}
#else
@@ -432,7 +432,7 @@ struct snd_hda_pin_quirk {
{ .codec = _codec,\
.subvendor = _subvendor,\
.value = _value,\
- .pins = (const struct hda_pintbl[]) { _pins } \
+ .pins = (const struct hda_pintbl[]) { _pins, {0, 0}} \
}
#endif