torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

[ALSA] hda-intel - Improve HD-audio codec probing robustness

Browse Source 
When modem is disabled in the BIOS, detection of the number of codecs
always fails after booting if STATESTS is not cleared first.
This patch fixes this problem and also adds an error check in a place
where a read error would lead to a very large number of pointless loops.

Signed-off-by: Danny Tholen <obiwan@mailmij.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Danny Tholen 2007-09-11 21:41:56 +02:00 committed by Jaroslav Kysela
parent 768d8c7df8
commit e8a7f136f5
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/hda/hda_codec.c
View File

@ -155,6 +155,8 @@ int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid,
unsigned int parm; unsigned int parm;
parm = snd_hda_param_read(codec, nid, AC_PAR_NODE_COUNT); parm = snd_hda_param_read(codec, nid, AC_PAR_NODE_COUNT);
if (parm == -1)
return 0;
*start_id = (parm >> 16) & 0x7fff; *start_id = (parm >> 16) & 0x7fff;
return (int)(parm & 0x7fff); return (int)(parm & 0x7fff);
} }

3
sound/pci/hda/hda_intel.c
View File

@ -687,6 +687,9 @@ static int azx_reset(struct azx *chip)
{ {
int count; int count;
/* clear STATESTS */
azx_writeb(chip, STATESTS, STATESTS_INT_MASK);
/* reset controller */ /* reset controller */
azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_RESET); azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_RESET);