Commit f4209f69 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next

parents 446bc11f cbcdf8c4

sound/pci/emu10k1/emupcm.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int snd_emu10k1_pcm_channel_alloc(struct snd_emu10k1_pcm * epcm, int voic 
	epcm->voices[0]->epcm = epcm;

	if (voices > 1) {

		for (i = 1; i < voices; i++) {

			epcm->voices[i] = &epcm->emu->voices[epcm->voices[0]->number + i];

			epcm->voices[i] = &epcm->emu->voices[(epcm->voices[0]->number + i) % NUM_G];

			epcm->voices[i]->epcm = epcm;

		}

	}

sound/pci/hda/hda_bind.c

+2 −2
Original line number Diff line number Diff line
@@ -157,9 +157,9 @@ static int hda_codec_driver_remove(struct device *dev) 
		return codec->bus->core.ext_ops->hdev_detach(&codec->core);

	}



	refcount_dec(&codec->pcm_ref);

	snd_hda_codec_disconnect_pcms(codec);

	snd_hda_jack_tbl_disconnect(codec);

	if (!refcount_dec_and_test(&codec->pcm_ref))

		wait_event(codec->remove_sleep, !refcount_read(&codec->pcm_ref));

	snd_power_sync_ref(codec->bus->card);

sound/pci/hda/hda_intel.c

+2 −0
Original line number Diff line number Diff line
@@ -2543,6 +2543,8 @@ static const struct pci_device_id azx_ids[] = { 
	/* 5 Series/3400 */

	{ PCI_DEVICE(0x8086, 0x3b56),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },

	{ PCI_DEVICE(0x8086, 0x3b57),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },

	/* Poulsbo */

	{ PCI_DEVICE(0x8086, 0x811b),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },

sound/pci/hda/patch_hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -3984,6 +3984,7 @@ static int tegra_hdmi_init(struct hda_codec *codec) 


	generic_hdmi_init_per_pins(codec);



	codec->depop_delay = 10;

	codec->patch_ops.build_pcms = tegra_hdmi_build_pcms;

	spec->chmap.ops.chmap_cea_alloc_validate_get_type =

		nvhdmi_chmap_cea_alloc_validate_get_type;

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -9569,6 +9569,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),

	SND_PCI_QUIRK(0x1849, 0x1233, "ASRock NUC Box 1100", ALC233_FIXUP_NO_AUDIO_JACK),

	SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MACH-WX9", ALC256_FIXUP_HUAWEI_MACH_WX9_PINS),

	SND_PCI_QUIRK(0x19e5, 0x320f, "Huawei WRT-WX9 ", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1b35, 0x1235, "CZC B20", ALC269_FIXUP_CZC_B20),

	SND_PCI_QUIRK(0x1b35, 0x1236, "CZC TMI", ALC269_FIXUP_CZC_TMI),

	SND_PCI_QUIRK(0x1b35, 0x1237, "CZC L101", ALC269_FIXUP_CZC_L101),