diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-07-27 04:16:04 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-07-27 04:16:04 -0400 |
| commit | 7899f81fe4aa76b7ff26293f9ef670b3d53e58aa (patch) | |
| tree | 1e2c19ab800db03958ff680b1d4b6405cca3f965 /sound | |
| parent | e5de3dfc391cceff6a4a3a0bb9c9c349a2e7c275 (diff) | |
| parent | cd7643bfb772dc7103ed6fc8dda6b233a8e14178 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 6e0de65f1f3..3252945f374 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) | |||
| 731 | for (i = 0; i < total_nodes; i++, nid++) { | 731 | for (i = 0; i < total_nodes; i++, nid++) { |
| 732 | function_id = snd_hda_param_read(codec, nid, | 732 | function_id = snd_hda_param_read(codec, nid, |
| 733 | AC_PAR_FUNCTION_TYPE); | 733 | AC_PAR_FUNCTION_TYPE); |
| 734 | switch (function_id) { | 734 | switch (function_id & 0xff) { |
| 735 | case AC_GRP_AUDIO_FUNCTION: | 735 | case AC_GRP_AUDIO_FUNCTION: |
| 736 | codec->afg = nid; | 736 | codec->afg = nid; |
| 737 | codec->afg_function_id = function_id & 0xff; | 737 | codec->afg_function_id = function_id & 0xff; |