diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:45 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:45 +0100 |
| commit | 86e1d57e4f24ca27ce813bdc2afaac4adafcbaf4 (patch) | |
| tree | 22b4797bfec25faa93a1166ea4ad39932536ee0d /sound/pci/hda/patch_ca0110.c | |
| parent | baf9226667734579e344f612ed39f727079cad51 (diff) | |
| parent | ac2c92e0cd06387ecee8115f5fa385fba6413c42 (diff) | |
| download | linux-86e1d57e4f24ca27ce813bdc2afaac4adafcbaf4.tar.gz linux-86e1d57e4f24ca27ce813bdc2afaac4adafcbaf4.tar.bz2 linux-86e1d57e4f24ca27ce813bdc2afaac4adafcbaf4.zip | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_ca0110.c')
| -rw-r--r-- | sound/pci/hda/patch_ca0110.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c index d08353d3bb7f..af478019088e 100644 --- a/sound/pci/hda/patch_ca0110.c +++ b/sound/pci/hda/patch_ca0110.c @@ -144,7 +144,7 @@ static int _add_switch(struct hda_codec *codec, hda_nid_t nid, const char *pfx, struct snd_kcontrol_new knew = HDA_CODEC_MUTE_MONO(namestr, nid, chan, 0, type); sprintf(namestr, "%s %s Switch", pfx, dirstr[dir]); - return snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec)); + return snd_hda_ctl_add(codec, nid, snd_ctl_new1(&knew, codec)); } static int _add_volume(struct hda_codec *codec, hda_nid_t nid, const char *pfx, @@ -155,7 +155,7 @@ static int _add_volume(struct hda_codec *codec, hda_nid_t nid, const char *pfx, struct snd_kcontrol_new knew = HDA_CODEC_VOLUME_MONO(namestr, nid, chan, 0, type); sprintf(namestr, "%s %s Volume", pfx, dirstr[dir]); - return snd_hda_ctl_add(codec, snd_ctl_new1(&knew, codec)); + return snd_hda_ctl_add(codec, nid, snd_ctl_new1(&knew, codec)); } #define add_out_switch(codec, nid, pfx) _add_switch(codec, nid, pfx, 3, 0) |