Commit 4af88a9c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



This merges and resolves the non-trivial conflicts with the recent fix
for hda-i915 binding fallback.

Conflicts:
	sound/pci/hda/hda_intel.c

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 692af901 bf06848b

sound/hda/hdac_regmap.c

+3 −0
Original line number Diff line number Diff line
@@ -265,6 +265,9 @@ static int hda_reg_write(void *context, unsigned int reg, unsigned int val) 
	unsigned int verb;

	int i, bytes, err;



	if (codec->caps_overwriting)

		return 0;



	reg &= ~0x00080000U; /* drop GET bit */

	reg |= (codec->addr << 28);

	verb = get_verb(reg);

sound/pci/hda/hda_intel.c

+2 −1
Original line number Diff line number Diff line
@@ -1987,7 +1987,7 @@ static int azx_probe_continue(struct azx *chip) 


		err = snd_hdac_i915_init(bus);

		if (err < 0)

			goto i915_power_fail;

			goto skip_i915;



		err = snd_hdac_display_power(bus, true);

		if (err < 0) {
@@ -1997,6 +1997,7 @@ static int azx_probe_continue(struct azx *chip) 
		}

	}



 skip_i915:

	err = azx_first_init(chip);

	if (err < 0)

		goto out_free;