diff options
| author | Takashi Iwai | 2010-09-09 14:21:17 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2010-09-09 16:45:58 +0200 |
| commit | b5786e85cb2ffd0b07e86dec38a442bd20765ad8 (patch) | |
| tree | b274f05600ab04ad189f48e342d02ebebc412140 /sound/pci/hda/hda_local.h | |
| parent | ALSA: HDA: Add fixup pins for Ideapad Y550 (diff) | |
| download | kernel-qcow2-linux-b5786e85cb2ffd0b07e86dec38a442bd20765ad8.tar.gz kernel-qcow2-linux-b5786e85cb2ffd0b07e86dec38a442bd20765ad8.tar.xz kernel-qcow2-linux-b5786e85cb2ffd0b07e86dec38a442bd20765ad8.zip | |
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_local.h')
| -rw-r--r-- | sound/pci/hda/hda_local.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index fb561748adb8..b448b0a997b1 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h @@ -215,7 +215,7 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid); */ #define HDA_MAX_NUM_INPUTS 16 struct hda_input_mux_item { - const char *label; + char label[32]; unsigned int index; }; struct hda_input_mux { @@ -391,8 +391,8 @@ struct auto_pin_cfg_item { }; struct auto_pin_cfg; -const char *snd_hda_get_input_pin_label(const struct auto_pin_cfg *cfg, - int input); +void snd_hda_get_input_pin_label(const struct auto_pin_cfg *cfg, + int input, char *label); struct auto_pin_cfg { int line_outs; |