mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
[ALSA] ac97 - Small fix for ALC65x codec
Modules: AC97 Codec Small fix for ALC65x codec, sync with Realtek's driver codes: - Rename 'IEC958 Playback Route' to 'IEC958 Playback Source' so that mixer can handle it properly Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
df694daa3c
commit
031c95d433
2 changed files with 3 additions and 1 deletions
|
@ -2411,6 +2411,8 @@ static int tune_alc_jack(struct snd_ac97 *ac97)
|
|||
}
|
||||
snd_ac97_update_bits(ac97, 0x7a, 0x20, 0x20); /* select jack detect function */
|
||||
snd_ac97_update_bits(ac97, 0x7a, 0x01, 0x01); /* Line-out auto mute */
|
||||
if (ac97->id == AC97_ID_ALC658D)
|
||||
snd_ac97_update_bits(ac97, 0x74, 0x0800, 0x0800);
|
||||
return snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&snd_ac97_alc_jack_detect, ac97));
|
||||
}
|
||||
|
||||
|
|
|
@ -2116,7 +2116,7 @@ static const struct snd_kcontrol_new snd_ac97_spdif_controls_alc655[] = {
|
|||
/* AC97_PAGE_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 14, 1, 0, 0), */
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route",
|
||||
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
|
||||
.info = alc655_iec958_route_info,
|
||||
.get = alc655_iec958_route_get,
|
||||
.put = alc655_iec958_route_put,
|
||||
|
|
Loading…
Reference in a new issue