Skip to contentSkip to conversation

ALSA: HDA: Fix Realtek automute Line Out -> Internal Speaker

PATCH In review David Henningsson 2 participants 2 messages Dec 1, 2011 Sound

lore
Share & tools
lore

David Henningsson

author
#0 lore raw

PATCH 1/1 ALSA: HDA: Fix Realtek automute Line Out -> Internal Speaker

This patch is a fixup for 3.0 and 3.1 only - 3.2 has a refactored automute for Realtek.

Takashi, could you ack this patch? I think Greg usually wants that before applying.

Signature · 2 lines
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic
Quoted 1 line

From d494dd1f0689328b2c9a62fa168ff774928becc6 Mon Sep 17 00:00:00 2001

From: David Henningsson <[email protected]>
Date: Tue, 29 Nov 2011 09:19:45 +0100
Subject: [PATCH] ALSA: HDA: Fix Realtek automute Line Out -> Internal Speaker

In kernels 3.0 and 3.1, no automute control was created unless Headphone pins were present. This patch enables automute for the case where there are just Line Out and Speaker pins.

BugLink http://bugs.launchpad.net/bugs/882693
Cc [email protected] (3.0 and 3.1)
Tested-by Marc Legris <[email protected]>
Signed-off-by David Henningsson <[email protected]>
---
 sound/pci/hda/patch_realtek.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
sound/pci/hda/patch_realtek.c +5 -1
index e7dc034..c85ce60 100644
@@ -1605,7 +1605,7 @@ static void alc_init_auto_hp(struct hda_codec *codec)
 		spec->automute = 1;
 		spec->automute_mode = ALC_AUTOMUTE_PIN;
 	}
-	if (spec->automute && cfg->line_out_pins[0] &&
+	if (cfg->line_out_pins[0] &&
 	    cfg->speaker_pins[0] &&
 	    cfg->line_out_pins[0] != cfg->hp_pins[0] &&
 	    cfg->line_out_pins[0] != cfg->speaker_pins[0]) {

@@ -1619,6 +1619,10 @@ static void alc_init_auto_hp(struct hda_codec *codec)
 					AC_VERB_SET_UNSOLICITED_ENABLE,
 					AC_USRSP_EN | ALC880_FRONT_EVENT);
 			spec->detect_line = 1;
+			if (!spec->automute) {
+				spec->automute = 1;
+				spec->automute_mode = ALC_AUTOMUTE_PIN;
+			}
 		}
 		spec->automute_lines = spec->detect_line;
 	}
Signature · 1 line
1.7.5.4
Reviewed-by on v1 1/1
#1 lore raw

At Thu, 01 Dec 2011 07:48:35 +0100,

Quoted 6 lines · David Henningsson

This patch is a fixup for 3.0 and 3.1 only - 3.2 has a refactored automute for Realtek.

Takashi, could you ack this patch? I think Greg usually wants that before applying.

Reviewed-by Takashi Iwai <[email protected]>

thanks,

Takashi