From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 03:07:04 +0000 (+1000)
Subject: Merge remote-tracking branch 'sound/for-next'
X-Git-Tag: next-20130619~60
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e1518446875452f8599c60bcf293fc2dbc432fd7;p=karo-tx-linux.git

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

e1518446875452f8599c60bcf293fc2dbc432fd7
diff --cc sound/pci/hda/hda_intel.c
index 35e9f8b010a7,f089fa0aa03d..f7581079aefe
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -3882,9 -3831,11 +3884,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 */