From: Takashi Iwai Date: Mon, 5 Dec 2005 19:51:43 +0000 (+0100) Subject: [ALSA] ac97 - Small fix for ALC65x codec X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=031c95d4338127a9599fcb7d449f4aa6f086786b;p=linux-beck.git [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 --- diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 17c3ddac35cc..33d7a1fc2f9f 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -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)); } diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index 1b72bc2b7e24..4aa5fdc5688e 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c @@ -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,