OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: HDA VIA: Fix crash on codecs without Headphone 

Don't enumerate via_hp_mixer while hp_mux is null (headphone does not exist),
to fix the crash of via_independent_hp_info (via_hp_mixer's .info), which will
reference hp_mux.

Signed-off-by: Logan Li <LoganLi@viatech.com.cn>
Signed-off-by: Harald Welte <HaraldWelte@viatech.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Harald Welte 2008-09-15 22:41:31 +08:00 committed by Jaroslav Kysela
parent a6d7731767
commit f8fdd4958b
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/pci/hda/patch_via.c
View File

@ -1303,7 +1303,8 @@ static int vt1708_parse_auto_config(struct hda_codec *codec)
spec->input_mux = &spec->private_imux[0];
spec->mixers[spec->num_mixers++] = via_hp_mixer;
if (spec->hp_mux)
spec->mixers[spec->num_mixers++] = via_hp_mixer;
return 1;
}
@ -1773,6 +1774,9 @@ static int vt1709_parse_auto_config(struct hda_codec *codec)
spec->input_mux = &spec->private_imux[0];
if (spec->hp_mux)
spec->mixers[spec->num_mixers++] = via_hp_mixer;
return 1;
}
@ -2314,7 +2318,8 @@ static int vt1708B_parse_auto_config(struct hda_codec *codec)
spec->input_mux = &spec->private_imux[0];
spec->mixers[spec->num_mixers++] = via_hp_mixer;
if (spec->hp_mux)
spec->mixers[spec->num_mixers++] = via_hp_mixer;
return 1;
}
@ -2770,7 +2775,8 @@ static int vt1708S_parse_auto_config(struct hda_codec *codec)
spec->input_mux = &spec->private_imux[0];
spec->mixers[spec->num_mixers++] = via_hp_mixer;
if (spec->hp_mux)
spec->mixers[spec->num_mixers++] = via_hp_mixer;
return 1;
}
@ -3100,7 +3106,8 @@ static int vt1702_parse_auto_config(struct hda_codec *codec)
spec->input_mux = &spec->private_imux[0];
spec->mixers[spec->num_mixers++] = via_hp_mixer;
if (spec->hp_mux)
spec->mixers[spec->num_mixers++] = via_hp_mixer;
return 1;
}