diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2009-12-10 07:57:01 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2009-12-15 03:33:32 -0500 |
| commit | 5e26dfd0615868872cb44842f1e1428c7b414ab0 (patch) | |
| tree | 75472db826d948edde152969045a819653ac54b3 /sound/pci/hda/patch_conexant.c | |
| parent | 9e3fd8719f624a43575b56a4777b1552399a8be8 (diff) | |
ALSA: hda - simplify usage of HDA_SUBDEV_AMP_FLAG
The HDA_SUBDEV_NID_FLAG is duplicate for amplifier control elements. Move
get_amp_nid_() call to the snd_hda_ctl_add() function.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index b68650af40a9..1ab2958a290b 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
| @@ -2178,7 +2178,7 @@ static struct snd_kcontrol_new cxt5066_mixer_master_olpc[] = { | |||
| 2178 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | | 2178 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | |
| 2179 | SNDRV_CTL_ELEM_ACCESS_TLV_READ | | 2179 | SNDRV_CTL_ELEM_ACCESS_TLV_READ | |
| 2180 | SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, | 2180 | SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, |
| 2181 | .subdevice = HDA_SUBDEV_NID_FLAG | HDA_SUBDEV_AMP_FLAG | 0x10, | 2181 | .subdevice = HDA_SUBDEV_AMP_FLAG, |
| 2182 | .info = snd_hda_mixer_amp_volume_info, | 2182 | .info = snd_hda_mixer_amp_volume_info, |
| 2183 | .get = snd_hda_mixer_amp_volume_get, | 2183 | .get = snd_hda_mixer_amp_volume_get, |
| 2184 | .put = snd_hda_mixer_amp_volume_put, | 2184 | .put = snd_hda_mixer_amp_volume_put, |