From be8f32c57a36e4d55ac437841794d7323620b588 Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Wed, 7 Nov 2012 09:22:33 +0100 Subject: [PATCH] --- yaml --- r: 342577 b: refs/heads/master c: c9adeefda0e29bed628e40e7f9da1f84243937e7 h: refs/heads/master i: 342575: 5d33b1f39705c183a7b76785c30c54dd8ca898ca v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_hdmi.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1b451c515e51..bbc38897e490 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4492363251235c4499a2d073c5f09121ea23d39d +refs/heads/master: c9adeefda0e29bed628e40e7f9da1f84243937e7 diff --git a/trunk/sound/pci/hda/patch_hdmi.c b/trunk/sound/pci/hda/patch_hdmi.c index 39ca1005995d..3824699142ee 100644 --- a/trunk/sound/pci/hda/patch_hdmi.c +++ b/trunk/sound/pci/hda/patch_hdmi.c @@ -1288,13 +1288,17 @@ static int hdmi_parse_codec(struct hda_codec *codec) } } +#ifdef CONFIG_PM + /* We're seeing some problems with unsolicited hot plug events on + * PantherPoint after S3, if this is not enabled */ + if (codec->vendor_id == 0x80862806) + codec->bus->power_keep_link_on = 1; /* * G45/IbexPeak don't support EPSS: the unsolicited pin hot plug event * can be lost and presence sense verb will become inaccurate if the * HDA link is powered off at hot plug or hw initialization time. */ -#ifdef CONFIG_PM - if (!(snd_hda_param_read(codec, codec->afg, AC_PAR_POWER_STATE) & + else if (!(snd_hda_param_read(codec, codec->afg, AC_PAR_POWER_STATE) & AC_PWRST_EPSS)) codec->bus->power_keep_link_on = 1; #endif