From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 13 Jan 2015 06:54:02 +0000 (+0100)
Subject: Merge tag 'topic/i915-hda-componentized-2015-01-12' of git://anongit.freedesktop... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1d69970d27210d18eaf153e04ed697ac7a4f17dc;p=linux-beck.git

Merge tag 'topic/i915-hda-componentized-2015-01-12' of git://anongit.freedesktop.org/drm-intel into for-next
---

1d69970d27210d18eaf153e04ed697ac7a4f17dc
diff --cc sound/pci/hda/hda_intel.c
index 23b35687025a,95a539993990..36d2f20db7a4
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -823,8 -799,11 +798,8 @@@ static int azx_suspend(struct device *d
  
  	if (chip->msi)
  		pci_disable_msi(chip->pci);
 -	pci_disable_device(pci);
 -	pci_save_state(pci);
 -	pci_set_power_state(pci, PCI_D3hot);
  	if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
- 		hda_display_power(false);
+ 		hda_display_power(hda, false);
  	return 0;
  }
  
@@@ -844,9 -823,18 +819,9 @@@ static int azx_resume(struct device *de
  		return 0;
  
  	if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
- 		hda_display_power(true);
- 		haswell_set_bclk(chip);
+ 		hda_display_power(hda, true);
+ 		haswell_set_bclk(hda);
  	}
 -	pci_set_power_state(pci, PCI_D0);
 -	pci_restore_state(pci);
 -	if (pci_enable_device(pci) < 0) {
 -		dev_err(chip->card->dev,
 -			"pci_enable_device failed, disabling device\n");
 -		snd_card_disconnect(card);
 -		return -EIO;
 -	}
 -	pci_set_master(pci);
  	if (chip->msi)
  		if (pci_enable_msi(pci) < 0)
  			chip->msi = 0;