summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-07-27 10:16:04 +0200
committerTakashi Iwai <tiwai@suse.de>2010-07-27 10:16:04 +0200
commit7899f81fe4aa76b7ff26293f9ef670b3d53e58aa (patch)
tree1e2c19ab800db03958ff680b1d4b6405cca3f965 /sound
parentsound: oss: waveartist: simplify waveartist_sleep() (diff)
parentALSA: hda-intel - fix function_id rework (add missing bitmask) (diff)
downloadlinux-7899f81fe4aa76b7ff26293f9ef670b3d53e58aa.tar.xz
linux-7899f81fe4aa76b7ff26293f9ef670b3d53e58aa.zip
Merge branch 'devel' of git.alsa-project.org:alsa-kernel into topic/misc
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_codec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 6e0de65f1f3a..3252945f3743 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -731,7 +731,7 @@ static void /*__devinit*/ setup_fg_nodes(struct hda_codec *codec)
for (i = 0; i < total_nodes; i++, nid++) {
function_id = snd_hda_param_read(codec, nid,
AC_PAR_FUNCTION_TYPE);
- switch (function_id) {
+ switch (function_id & 0xff) {
case AC_GRP_AUDIO_FUNCTION:
codec->afg = nid;
codec->afg_function_id = function_id & 0xff;