openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-06-11 06:52:31 +02:00
parent 692af901df bf06848bdb
commit 4af88a9c1b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/hda/hdac_regmap.c
View File

@ -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);

3
sound/pci/hda/hda_intel.c
View File

@ -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;