From b944fb7f4f44c3b4f3d54493686524e30bb7873c Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 5 Dec 2005 20:51:43 +0100 Subject: [PATCH] --- yaml --- r: 16151 b: refs/heads/master c: 031c95d4338127a9599fcb7d449f4aa6f086786b h: refs/heads/master i: 16149: 80ec09d01a1d16768a8f5aecc94d05a28ffcce1f 16147: 8cfed5fbea824f84157bcb3f108efc39bdd58476 16143: 500ad260b949b5101a4a1195f7626234823df335 v: v3 --- [refs] | 2 +- trunk/sound/pci/ac97/ac97_codec.c | 2 ++ trunk/sound/pci/ac97/ac97_patch.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d77e43922941..bb5603e8b297 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df694daa3c0135202e4702cb2d11e68a43f6c51e +refs/heads/master: 031c95d4338127a9599fcb7d449f4aa6f086786b diff --git a/trunk/sound/pci/ac97/ac97_codec.c b/trunk/sound/pci/ac97/ac97_codec.c index 17c3ddac35cc..33d7a1fc2f9f 100644 --- a/trunk/sound/pci/ac97/ac97_codec.c +++ b/trunk/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/trunk/sound/pci/ac97/ac97_patch.c b/trunk/sound/pci/ac97/ac97_patch.c index 1b72bc2b7e24..4aa5fdc5688e 100644 --- a/trunk/sound/pci/ac97/ac97_patch.c +++ b/trunk/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,