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>
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 93b86ad..9c1909d 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -2376,7 +2376,7 @@
/* for hp mode select */
i = 0;
while (texts[i] != NULL) {
- imux->items[imux->num_items].label = texts[i];
+ strcpy(imux->items[imux->num_items].label, texts[i]);
imux->items[imux->num_items].index = i;
imux->num_items++;
i++;
@@ -2423,7 +2423,8 @@
/* for internal loopback recording select */
for (idx = 0; idx < num_idxs; idx++) {
if (pin_idxs[idx] == 0xff) {
- imux->items[imux->num_items].label = "Stereo Mixer";
+ strcpy(imux->items[imux->num_items].label,
+ "Stereo Mixer");
imux->items[imux->num_items].index = idx;
imux->num_items++;
break;
@@ -2445,8 +2446,8 @@
type_idx, idx, cap_nid);
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 = idx;
imux->num_items++;
}
@@ -4336,7 +4337,7 @@
/* for hp mode select */
i = 0;
while (texts[i] != NULL) {
- imux->items[imux->num_items].label = texts[i];
+ strcpy(imux->items[imux->num_items].label, texts[i]);
imux->items[imux->num_items].index = i;
imux->num_items++;
i++;
@@ -5520,7 +5521,7 @@
return err;
/* for digital mic select */
- imux->items[imux->num_items].label = "Digital Mic";
+ strcpy(imux->items[imux->num_items].label, "Digital Mic");
imux->items[imux->num_items].index = 4;
imux->num_items++;
@@ -5843,7 +5844,7 @@
return err;
/* for digital mic select */
- imux->items[imux->num_items].label = "Digital Mic";
+ strcpy(imux->items[imux->num_items].label, "Digital Mic");
imux->items[imux->num_items].index = 6;
imux->num_items++;