diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2009-11-12 12:15:48 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-16 13:35:19 +0300 |
| commit | 4d02d1b638af580ae3d69367248539a8b3893064 (patch) | |
| tree | 2e3deb96c2fcd98e83644b816d1ae7294f67b05e /sound/pci/hda/hda_codec.c | |
| parent | 3911a4c19e927738766003839aa447becbdbaa27 (diff) | |
| download | linux-4d02d1b638af580ae3d69367248539a8b3893064.tar.xz | |
ALSA: hda - proc - add support for dynamic controls to mixer<->NID mapping
This patch adds support for dynamically created controls to proc codec file
(Control: lines).
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 1ed1d88e1834..d71e651046eb 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -1523,6 +1523,11 @@ int snd_hda_ctl_add(struct hda_codec *codec, hda_nid_t nid, int err; struct hda_nid_item *item; + if (kctl->id.subdevice & (1<<31)) { + if (nid == 0) + nid = kctl->id.subdevice & 0xffff; + kctl->id.subdevice = 0; + } err = snd_ctl_add(codec->bus->card, kctl); if (err < 0) return err; @@ -3160,7 +3165,7 @@ EXPORT_SYMBOL_HDA(snd_hda_check_board_codec_sid_config); */ int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew) { - int err; + int err; for (; knew->name; knew++) { struct snd_kcontrol *kctl; |