Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8efeb350 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "We're keeping in a good shape, this batch contains just a few small
  fixes (a regression fix for ASoC rt5677 codec, NULL dereference and
  error-path fixes in firewire, and a corner-case ioctl error fix for
  user TLV), as well as usual quirks for USB-audio and HD-audio"

* tag 'sound-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: rt5677: Reintroduce I2C device IDs
  ALSA: hda - Add stereo mic quirk for Lenovo G50-70 (17aa:3978)
  ALSA: core: Fix unexpected error at replacing user TLV
  ALSA: usb-audio: Add delay quirk for H650e/Jabra 550a USB headsets
  ALSA: firewire-motu: destroy stream data surely at failure of card initialization
  ALSA: firewire: fix NULL pointer dereference when releasing uninitialized data of iso-resource
parents 985e7755 9ce76511

sound/core/control.c

+1 −1
Original line number Diff line number Diff line
@@ -1137,7 +1137,7 @@ static int snd_ctl_elem_user_tlv(struct snd_kcontrol *kcontrol, 
		mutex_lock(&ue->card->user_ctl_lock);

		change = ue->tlv_data_size != size;

		if (!change)

			change = memcmp(ue->tlv_data, new_data, size);

			change = memcmp(ue->tlv_data, new_data, size) != 0;

		kfree(ue->tlv_data);

		ue->tlv_data = new_data;

		ue->tlv_data_size = size;

sound/firewire/iso-resources.c

+6 −1
Original line number Diff line number Diff line
@@ -210,9 +210,14 @@ EXPORT_SYMBOL(fw_iso_resources_update); 
 */

void fw_iso_resources_free(struct fw_iso_resources *r)

{

	struct fw_card *card = fw_parent_device(r->unit)->card;

	struct fw_card *card;

	int bandwidth, channel;



	/* Not initialized. */

	if (r->unit == NULL)

		return;

	card = fw_parent_device(r->unit)->card;



	mutex_lock(&r->mutex);



	if (r->allocated) {

sound/firewire/motu/motu.c

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ static void do_registration(struct work_struct *work) 
	return;

error:

	snd_motu_transaction_unregister(motu);

	snd_motu_stream_destroy_duplex(motu);

	snd_card_free(motu->card);

	dev_info(&motu->unit->device,

		 "Sound card registration failed: %d\n", err);

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -947,6 +947,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x17aa, 0x390b, "Lenovo G50-80", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo G50-70", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", CXT_FIXUP_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004),

sound/soc/codecs/rt5677.c

+1 −0
Original line number Diff line number Diff line
@@ -5021,6 +5021,7 @@ static const struct regmap_config rt5677_regmap = { 
static const struct i2c_device_id rt5677_i2c_id[] = {

	{ "rt5677", RT5677 },

	{ "rt5676", RT5676 },

	{ "RT5677CE:00", RT5677 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id);