From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 19 Jan 2010 14:53:43 +0000 (+0100)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=9e4c84967ef027fe50a03cf48dd6da9519c8e60c;p=linux-edison.git

Merge branch 'fix/hda' into topic/hda

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

9e4c84967ef027fe50a03cf48dd6da9519c8e60c
diff --cc sound/pci/hda/patch_realtek.c
index 141ff446104,6ae610c0111..c53faa95939
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -3715,34 -3642,6 +3724,31 @@@ static void alc_free(struct hda_codec *
  }
  
  #ifdef CONFIG_SND_HDA_POWER_SAVE
 +static void alc_power_eapd(struct hda_codec *codec)
 +{
 +	/* We currently only handle front, HP */
 +	switch (codec->vendor_id) {
 +	case 0x10ec0260:
- 		snd_hda_codec_write(codec, 0x0f, 0,
- 				    AC_VERB_SET_EAPD_BTLENABLE, 0x00);
- 		snd_hda_codec_write(codec, 0x10, 0,
- 				    AC_VERB_SET_EAPD_BTLENABLE, 0x00);
++		set_eapd(codec, 0x0f, 0);
++		set_eapd(codec, 0x10, 0);
 +		break;
 +	case 0x10ec0262:
 +	case 0x10ec0267:
 +	case 0x10ec0268:
 +	case 0x10ec0269:
++	case 0x10ec0270:
 +	case 0x10ec0272:
 +	case 0x10ec0660:
 +	case 0x10ec0662:
 +	case 0x10ec0663:
 +	case 0x10ec0862:
 +	case 0x10ec0889:
- 		snd_hda_codec_write(codec, 0x14, 0,
- 				    AC_VERB_SET_EAPD_BTLENABLE, 0x00);
- 		snd_hda_codec_write(codec, 0x15, 0,
- 				    AC_VERB_SET_EAPD_BTLENABLE, 0x00);
++		set_eapd(codec, 0x14, 0);
++		set_eapd(codec, 0x15, 0);
 +		break;
 +	}
 +}
 +
  static int alc_suspend(struct hda_codec *codec, pm_message_t state)
  {
  	struct alc_spec *spec = codec->spec;