leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: hdmi - dont fail on extra nodes

Browse Source 
The number of HDMI nodes is expected to go up in future.
So don't fail hard on seeing extra converter/pin nodes.

We can still operate safely on the nodes within
MAX_HDMI_CVTS/MAX_HDMI_PINS.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Wu Fengguang 2010-05-14 16:36:15 +08:00 committed by Takashi Iwai
parent e48b00870f
commit 3eaead579e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/pci/hda/patch_hdmi.c
View File

@ -766,7 +766,7 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
if (spec->num_pins >= MAX_HDMI_PINS) { if (spec->num_pins >= MAX_HDMI_PINS) {
snd_printk(KERN_WARNING snd_printk(KERN_WARNING
"HDMI: no space for pin %d\n", pin_nid); "HDMI: no space for pin %d\n", pin_nid);
return -EINVAL; return -E2BIG;
} }
hdmi_present_sense(codec, pin_nid, &spec->sink_eld[spec->num_pins]); hdmi_present_sense(codec, pin_nid, &spec->sink_eld[spec->num_pins]);
@ -788,7 +788,7 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t nid)
if (spec->num_cvts >= MAX_HDMI_CVTS) { if (spec->num_cvts >= MAX_HDMI_CVTS) {
snd_printk(KERN_WARNING snd_printk(KERN_WARNING
"HDMI: no space for converter %d\n", nid); "HDMI: no space for converter %d\n", nid);
return -EINVAL; return -E2BIG;
} }
spec->cvt[spec->num_cvts] = nid; spec->cvt[spec->num_cvts] = nid;
@ -820,15 +820,13 @@ static int hdmi_parse_codec(struct hda_codec *codec)
switch (type) { switch (type) {
case AC_WID_AUD_OUT: case AC_WID_AUD_OUT:
if (hdmi_add_cvt(codec, nid) < 0) hdmi_add_cvt(codec, nid);
return -EINVAL;
break; break;
case AC_WID_PIN: case AC_WID_PIN:
caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP); caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
if (!(caps & (AC_PINCAP_HDMI | AC_PINCAP_DP))) if (!(caps & (AC_PINCAP_HDMI | AC_PINCAP_DP)))
continue; continue;
if (hdmi_add_pin(codec, nid) < 0) hdmi_add_pin(codec, nid);
return -EINVAL;
break; break;
} }
} }