diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-09-09 08:21:17 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-09-09 10:45:58 -0400 |
commit | b5786e85cb2ffd0b07e86dec38a442bd20765ad8 (patch) | |
tree | b274f05600ab04ad189f48e342d02ebebc412140 /sound/pci/hda/patch_analog.c | |
parent | 6cb3b707f95954ac18f19b4b3919af235738371a (diff) |
ALSA: hda - Keep char arrays in input_mux items
Keep char array in the input_mux item itself instead of pointing to
an external string. This is a preliminary work for improving the
input-mux name based on the pin role.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
-rw-r--r-- | sound/pci/hda/patch_analog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 3409d315f507..8de3a0dc45e4 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
@@ -2926,13 +2926,13 @@ static int ad1988_auto_create_analog_input_ctls(struct ad198x_spec *spec, | |||
2926 | type <= AUTO_PIN_FRONT_MIC); | 2926 | type <= AUTO_PIN_FRONT_MIC); |
2927 | if (err < 0) | 2927 | if (err < 0) |
2928 | return err; | 2928 | return err; |
2929 | imux->items[imux->num_items].label = | 2929 | snd_hda_get_input_pin_label(cfg, i, |
2930 | snd_hda_get_input_pin_label(cfg, i); | 2930 | imux->items[imux->num_items].label); |
2931 | imux->items[imux->num_items].index = | 2931 | imux->items[imux->num_items].index = |
2932 | ad1988_pin_to_adc_idx(cfg->inputs[i].pin); | 2932 | ad1988_pin_to_adc_idx(cfg->inputs[i].pin); |
2933 | imux->num_items++; | 2933 | imux->num_items++; |
2934 | } | 2934 | } |
2935 | imux->items[imux->num_items].label = "Mix"; | 2935 | strcpy(imux->items[imux->num_items].label, "Mix"); |
2936 | imux->items[imux->num_items].index = 9; | 2936 | imux->items[imux->num_items].index = 9; |
2937 | imux->num_items++; | 2937 | imux->num_items++; |
2938 | 2938 | ||