diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:13 +0100 |
| commit | 843ad02fa4fb9230cd19923cc8ea1d6096cadf4e (patch) | |
| tree | b9dccce37420e6fd0d2b8e65cf6526b3c9be3944 /sound/pci/ac97 | |
| parent | 60c4e7c120d8cfe83fa4b0978b682b6d140483ac (diff) | |
| parent | 14ab08610971eb1db572ad8ca63acd13bc4d4caf (diff) | |
| download | op-kernel-dev-843ad02fa4fb9230cd19923cc8ea1d6096cadf4e.zip op-kernel-dev-843ad02fa4fb9230cd19923cc8ea1d6096cadf4e.tar.gz | |
Merge branch 'topic/intel8x0' into for-linus
Diffstat (limited to 'sound/pci/ac97')
| -rw-r--r-- | sound/pci/ac97/ac97_codec.c | 2 | ||||
| -rw-r--r-- | sound/pci/ac97/ac97_proc.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 44f2381..97ee127 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -384,7 +384,7 @@ int snd_ac97_update_bits(struct snd_ac97 *ac97, unsigned short reg, unsigned sho EXPORT_SYMBOL(snd_ac97_update_bits); -/* no lock version - see snd_ac97_updat_bits() */ +/* no lock version - see snd_ac97_update_bits() */ int snd_ac97_update_bits_nolock(struct snd_ac97 *ac97, unsigned short reg, unsigned short mask, unsigned short value) { diff --git a/sound/pci/ac97/ac97_proc.c b/sound/pci/ac97/ac97_proc.c index 060ea59..73b17d5 100644 --- a/sound/pci/ac97/ac97_proc.c +++ b/sound/pci/ac97/ac97_proc.c @@ -125,6 +125,8 @@ static void snd_ac97_proc_read_main(struct snd_ac97 *ac97, struct snd_info_buffe snd_iprintf(buffer, "PCI Subsys Device: 0x%04x\n\n", ac97->subsystem_device); + snd_iprintf(buffer, "Flags: %x\n", ac97->flags); + if ((ac97->ext_id & AC97_EI_REV_MASK) >= AC97_EI_REV_23) { val = snd_ac97_read(ac97, AC97_INT_PAGING); snd_ac97_update_bits(ac97, AC97_INT_PAGING, |
