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.

diff --cc sound/pci/hda/hda_controller.c
Simple merge

diff --cc sound/pci/hda/hda_intel.c
index 75b52c4cd70dc5b90a3a593b56f2d41ac9fd4221,83cd19017cf38aeaab7d25d76eb0e9106ec84681..8edcee5f034d1f668da3930e49916c87d706133a
--- 1/sound/pci/hda/hda_intel.c
--- 2/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 ||

diff --cc sound/pci/hda/hda_priv.h
Simple merge

diff --cc sound/pci/hda/hda_tegra.c
Simple merge

diff --cc sound/pci/hda/patch_hdmi.c
Simple merge