From d4c7a6a00ad51c18776ae88bd7424323689321d9 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 20 Dec 2012 10:45:55 +0100 Subject: [PATCH] --- yaml --- r: 353049 b: refs/heads/master c: 5fdaecdb0d8fd8131d2adb9ca0ae2b77707b36ca h: refs/heads/master i: 353047: 12a0f0b4e3d038737318f2e0e0f3bba7bf9f9f32 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_codec.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e51a5acfc3b8..37f8e182edb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 624d914d091a5eebb4d648bd6b4ae6481171ae5c +refs/heads/master: 5fdaecdb0d8fd8131d2adb9ca0ae2b77707b36ca diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c index e7749dee7c40..ef0a0eebec83 100644 --- a/trunk/sound/pci/hda/hda_codec.c +++ b/trunk/sound/pci/hda/hda_codec.c @@ -424,6 +424,7 @@ int snd_hda_get_raw_connections(struct hda_codec *codec, hda_nid_t nid, unsigned int shift, num_elems, mask; unsigned int wcaps; hda_nid_t prev_nid; + int null_count = 0; if (snd_BUG_ON(!conn_list || max_conns <= 0)) return -EINVAL; @@ -474,7 +475,7 @@ int snd_hda_get_raw_connections(struct hda_codec *codec, hda_nid_t nid, } range_val = !!(parm & (1 << (shift-1))); /* ranges */ val = parm & mask; - if (val == 0) { + if (val == 0 && null_count++) { /* no second chance */ snd_printk(KERN_WARNING "hda_codec: " "invalid CONNECT_LIST verb %x[%i]:%x\n", nid, i, parm);