diff options
| author | Wu Fengguang | 2009-08-24 03:50:46 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2009-08-24 09:42:48 +0200 |
| commit | fd72d008465d45db63d7f8931eea6a04e05916d6 (patch) | |
| tree | 8daba43d08b3162e028799d06f0c487e301a1ab5 /sound/pci/hda/hda_proc.c | |
| parent | Merge branch 'fix/hda' into topic/hda (diff) | |
| download | kernel-qcow2-linux-fd72d008465d45db63d7f8931eea6a04e05916d6.tar.gz kernel-qcow2-linux-fd72d008465d45db63d7f8931eea6a04e05916d6.tar.xz kernel-qcow2-linux-fd72d008465d45db63d7f8931eea6a04e05916d6.zip | |
ALSA: hda: move open coded tricks into get_wcaps_channels()
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_proc.c')
| -rw-r--r-- | sound/pci/hda/hda_proc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c index a721eb08a290..95f24e4729f8 100644 --- a/sound/pci/hda/hda_proc.c +++ b/sound/pci/hda/hda_proc.c @@ -515,9 +515,7 @@ static void print_codec_info(struct snd_info_entry *entry, snd_iprintf(buffer, "Node 0x%02x [%s] wcaps 0x%x:", nid, get_wid_type_name(wid_type), wid_caps); if (wid_caps & AC_WCAP_STEREO) { - unsigned int chans; - chans = (wid_caps & AC_WCAP_CHAN_CNT_EXT) >> 13; - chans = ((chans << 1) | 1) + 1; + unsigned int chans = get_wcaps_channels(wid_caps); if (chans == 2) snd_iprintf(buffer, " Stereo"); else |