diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-09 14:21:17 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-09 16:45:58 +0200 |
| commit | b5786e85cb2ffd0b07e86dec38a442bd20765ad8 (patch) | |
| tree | b274f05600ab04ad189f48e342d02ebebc412140 /sound/pci/hda/hda_generic.c | |
| parent | 6cb3b707f95954ac18f19b4b3919af235738371a (diff) | |
| download | op-kernel-dev-b5786e85cb2ffd0b07e86dec38a442bd20765ad8.zip op-kernel-dev-b5786e85cb2ffd0b07e86dec38a442bd20765ad8.tar.gz | |
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/hda_generic.c')
| -rw-r--r-- | sound/pci/hda/hda_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 5ea2128..cce18ba 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -566,7 +566,7 @@ static int parse_adc_sub_nodes(struct hda_codec *codec, struct hda_gspec *spec, } label = spec->cap_labels[spec->input_mux.num_items]; strcpy(label, type); - spec->input_mux.items[spec->input_mux.num_items].label = label; + strcpy(spec->input_mux.items[spec->input_mux.num_items].label, label); /* unmute the PIN external input */ unmute_input(codec, node, 0); /* index = 0? */ |
