From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Jun 2013 03:33:42 +0000 (+1000)
Subject: Merge remote-tracking branch 'sound/for-next'
X-Git-Tag: next-20130628~64
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=458f9c8583272b6dfb1c166676bde085331b9673;p=karo-tx-linux.git

Merge remote-tracking branch 'sound/for-next'
---

458f9c8583272b6dfb1c166676bde085331b9673
diff --cc sound/pci/hda/hda_intel.c
index 35e9f8b010a7,f39de9055097..8860dd529520
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -2953,9 -2962,8 +2972,10 @@@ static int azx_runtime_suspend(struct d
  	struct azx *chip = card->private_data;
  
  	azx_stop_chip(chip);
+ 	azx_enter_link_reset(chip);
  	azx_clear_irq_pending(chip);
 +	if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
 +		hda_display_power(false);
  	return 0;
  }
  
@@@ -3882,9 -3848,11 +3901,8 @@@ static void azx_remove(struct pci_dev *
  {
  	struct snd_card *card = pci_get_drvdata(pci);
  
 -	if (pci_dev_run_wake(pci))
 -		pm_runtime_get_noresume(&pci->dev);
 -
  	if (card)
  		snd_card_free(card);
- 	pci_set_drvdata(pci, NULL);
  }
  
  /* PCI IDs */