lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: hda - Keep char arrays in input_mux items

Browse Source 
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>
This commit is contained in:
Takashi Iwai
2010-09-09 14:21:17 +02:00
parent 6cb3b707f9
commit b5786e85cb
7 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/pci/hda/patch_analog.c
View File

@ -2926,13 +2926,13 @@ static int ad1988_auto_create_analog_input_ctls(struct ad198x_spec *spec,
type <= AUTO_PIN_FRONT_MIC);
if (err < 0)
return err;
imux->items[imux->num_items].label =
snd_hda_get_input_pin_label(cfg, i);
snd_hda_get_input_pin_label(cfg, i,
imux->items[imux->num_items].label);
imux->items[imux->num_items].index =
ad1988_pin_to_adc_idx(cfg->inputs[i].pin);
imux->num_items++;
}
imux->items[imux->num_items].label = "Mix";
strcpy(imux->items[imux->num_items].label, "Mix");
imux->items[imux->num_items].index = 9;
imux->num_items++;