From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 23 Aug 2011 13:02:36 +0000 (+0200)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Tag: v3.2-rc1~38^2~73
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fa9b1511216282e27e048defae78c0f44c148d1;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c
---

5fa9b1511216282e27e048defae78c0f44c148d1
diff --cc sound/pci/hda/patch_realtek.c
index e0ecf5a,7cabd73..c3e5af9
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -581,9 -568,9 +581,9 @@@ static void alc_hp_automute(struct hda_
  	spec->jack_present =
  		detect_jacks(codec, ARRAY_SIZE(spec->autocfg.hp_pins),
  			     spec->autocfg.hp_pins);
+ 	if (!spec->automute)
+ 		return;
 -	update_speakers(codec);
 +	call_update_speakers(codec);
  }
  
  /* standard line-out-automute helper */
@@@ -594,9 -581,9 +594,9 @@@ static void alc_line_automute(struct hd
  	spec->line_jack_present =
  		detect_jacks(codec, ARRAY_SIZE(spec->autocfg.line_out_pins),
  			     spec->autocfg.line_out_pins);
+ 	if (!spec->automute || !spec->detect_line)
+ 		return;
 -	update_speakers(codec);
 +	call_update_speakers(codec);
  }
  
  #define get_connection_index(codec, mux, nid) \