diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-10 12:52:27 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-10 12:56:41 +0200 |
| commit | 3c6aae4489e7c05f3685e9eaa538249be7c79ebe (patch) | |
| tree | 95d1db12b1668da922684d45acd156fe308ca35f | |
| parent | 31909b83ea5b4035ce129bb0df622ec2d2fb3e96 (diff) | |
| download | kernel_samsung_espresso10-3c6aae4489e7c05f3685e9eaa538249be7c79ebe.zip kernel_samsung_espresso10-3c6aae4489e7c05f3685e9eaa538249be7c79ebe.tar.gz kernel_samsung_espresso10-3c6aae4489e7c05f3685e9eaa538249be7c79ebe.tar.bz2 | |
ALSA: hda - Check codec errors in snd_hda_get_connections()
The codec read errors in snd_hda_get_connections() are ignored so far,
and it causes a problem like the bug in the commit
9d30937accf2c01e8b0bd59787409a7348cbbcb7
ALSA: hda_intel: more strict alc880_parse_auto_config dig_nid checking
Better to check errors in the function and returns a proper error code
rather than passing bogus NID values.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 94d848e..ec352c6 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -316,6 +316,8 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid, /* single connection */ parm = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_LIST, 0); + if (parm == -1 && codec->bus->rirb_error) + return -EIO; conn_list[0] = parm & mask; return 1; } @@ -327,9 +329,12 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid, int range_val; hda_nid_t val, n; - if (i % num_elems == 0) + if (i % num_elems == 0) { parm = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_LIST, i); + if (parm == -1 && codec->bus->rirb_error) + return -EIO; + } range_val = !!(parm & (1 << (shift-1))); /* ranges */ val = parm & mask; parm >>= shift; |