diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-12-05 14:51:43 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:30:22 -0500 |
commit | 031c95d4338127a9599fcb7d449f4aa6f086786b (patch) | |
tree | 9ed7e559fbb931f720fb7aa03240da7786fbf65a /sound/pci/ac97 | |
parent | df694daa3c0135202e4702cb2d11e68a43f6c51e (diff) |
[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>
Diffstat (limited to 'sound/pci/ac97')
-rw-r--r-- | sound/pci/ac97/ac97_codec.c | 2 | ||||
-rw-r--r-- | sound/pci/ac97/ac97_patch.c | 2 |
2 files changed, 3 insertions, 1 deletions
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) | |||
2411 | } | 2411 | } |
2412 | snd_ac97_update_bits(ac97, 0x7a, 0x20, 0x20); /* select jack detect function */ | 2412 | snd_ac97_update_bits(ac97, 0x7a, 0x20, 0x20); /* select jack detect function */ |
2413 | snd_ac97_update_bits(ac97, 0x7a, 0x01, 0x01); /* Line-out auto mute */ | 2413 | snd_ac97_update_bits(ac97, 0x7a, 0x01, 0x01); /* Line-out auto mute */ |
2414 | if (ac97->id == AC97_ID_ALC658D) | ||
2415 | snd_ac97_update_bits(ac97, 0x74, 0x0800, 0x0800); | ||
2414 | return snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&snd_ac97_alc_jack_detect, ac97)); | 2416 | return snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&snd_ac97_alc_jack_detect, ac97)); |
2415 | } | 2417 | } |
2416 | 2418 | ||
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[] = { | |||
2116 | /* AC97_PAGE_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 14, 1, 0, 0), */ | 2116 | /* AC97_PAGE_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 14, 1, 0, 0), */ |
2117 | { | 2117 | { |
2118 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 2118 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
2119 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route", | 2119 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source", |
2120 | .info = alc655_iec958_route_info, | 2120 | .info = alc655_iec958_route_info, |
2121 | .get = alc655_iec958_route_get, | 2121 | .get = alc655_iec958_route_get, |
2122 | .put = alc655_iec958_route_put, | 2122 | .put = alc655_iec958_route_put, |