From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 15 Jul 2014 13:27:19 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: v3.17-rc1~101^2~13^2~12
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1618e84aa87af94b46921b265b68bb7994571c20;p=~emulex%2Finfiniband.git

Merge branch 'for-linus' into for-next

Since init_failed flag was moved to struct hda_intel, its access in
the commit [4da63c6f: ALSA: hda - Fix broken PM due to incomplete
i915 initialization] is also replaced with hda->init_failed
appropriately.
---

1618e84aa87af94b46921b265b68bb7994571c20
diff --cc sound/pci/hda/hda_intel.c
index 75b52c4cd70,83cd19017cf..8edcee5f034
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -773,9 -594,9 +773,10 @@@ static int azx_suspend(struct device *d
  	struct pci_dev *pci = to_pci_dev(dev);
  	struct snd_card *card = dev_get_drvdata(dev);
  	struct azx *chip = card->private_data;
++	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
  	struct azx_pcm *p;
  
- 	if (chip->disabled)
 -	if (chip->disabled || chip->init_failed)
++	if (chip->disabled || hda->init_failed)
  		return 0;
  
  	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
@@@ -806,8 -627,8 +807,9 @@@ static int azx_resume(struct device *de
  	struct pci_dev *pci = to_pci_dev(dev);
  	struct snd_card *card = dev_get_drvdata(dev);
  	struct azx *chip = card->private_data;
++	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
  
- 	if (chip->disabled)
 -	if (chip->disabled || chip->init_failed)
++	if (chip->disabled || hda->init_failed)
  		return 0;
  
  	if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
@@@ -843,8 -664,8 +845,9 @@@ static int azx_runtime_suspend(struct d
  {
  	struct snd_card *card = dev_get_drvdata(dev);
  	struct azx *chip = card->private_data;
++	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
  
- 	if (chip->disabled)
 -	if (chip->disabled || chip->init_failed)
++	if (chip->disabled || hda->init_failed)
  		return 0;
  
  	if (!(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
@@@ -867,11 -688,11 +870,12 @@@ static int azx_runtime_resume(struct de
  {
  	struct snd_card *card = dev_get_drvdata(dev);
  	struct azx *chip = card->private_data;
++	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
  	struct hda_bus *bus;
  	struct hda_codec *codec;
  	int status;
  
- 	if (chip->disabled)
 -	if (chip->disabled || chip->init_failed)
++	if (chip->disabled || hda->init_failed)
  		return 0;
  
  	if (!(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
@@@ -907,8 -728,8 +911,9 @@@ static int azx_runtime_idle(struct devi
  {
  	struct snd_card *card = dev_get_drvdata(dev);
  	struct azx *chip = card->private_data;
++	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
  
- 	if (chip->disabled)
 -	if (chip->disabled || chip->init_failed)
++	if (chip->disabled || hda->init_failed)
  		return 0;
  
  	if (!power_save_controller ||