summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_intel.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-11-26 11:58:40 +0100
committerTakashi Iwai <tiwai@suse.de>2013-11-26 13:40:14 +0100
commit873ce8ad502cce3ba9295890d52afcce385d4107 (patch)
tree8fd73b474402cc182e1b7afecf77b9dadd51a4ec /sound/pci/hda/hda_intel.c
parent9ad54547cf6f4410eba83bb95dfd2a0966718d6d (diff)
downloadblackbird-obmc-linux-873ce8ad502cce3ba9295890d52afcce385d4107.tar.gz
blackbird-obmc-linux-873ce8ad502cce3ba9295890d52afcce385d4107.zip
ALSA: hda - Drop bus->avoid_link_reset flag
Use bus->power_keep_link_on instead. The controller shouldn't go to D3 when the link isn't reset, so essentially avoiding the link reset means avoiding the runtime PM. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r--sound/pci/hda/hda_intel.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 7a09404579a7..c6d230193da6 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2994,8 +2994,7 @@ static int azx_runtime_suspend(struct device *dev)
STATESTS_INT_MASK);
azx_stop_chip(chip);
- if (!chip->bus->avoid_link_reset)
- azx_enter_link_reset(chip);
+ azx_enter_link_reset(chip);
azx_clear_irq_pending(chip);
if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
hda_display_power(false);
OpenPOWER on IntegriCloud