Commit 5f2ad594 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Pull the user control race fix, so that we can continue working on the
code refactoring.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents a8c0d132 e1a7bfe3

sound/core/control.c

+45 −35
Original line number Diff line number Diff line
@@ -348,6 +348,40 @@ static int snd_ctl_find_hole(struct snd_card *card, unsigned int count) 
	return 0;

}



/* add a new kcontrol object; call with card->controls_rwsem locked */

static int __snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)

{

	struct snd_ctl_elem_id id;

	unsigned int idx;

	unsigned int count;



	id = kcontrol->id;

	if (id.index > UINT_MAX - kcontrol->count)

		return -EINVAL;



	if (snd_ctl_find_id(card, &id)) {

		dev_err(card->dev,

			"control %i:%i:%i:%s:%i is already present\n",

			id.iface, id.device, id.subdevice, id.name, id.index);

		return -EBUSY;

	}



	if (snd_ctl_find_hole(card, kcontrol->count) < 0)

		return -ENOMEM;



	list_add_tail(&kcontrol->list, &card->controls);

	card->controls_count += kcontrol->count;

	kcontrol->id.numid = card->last_numid + 1;

	card->last_numid += kcontrol->count;



	id = kcontrol->id;

	count = kcontrol->count;

	for (idx = 0; idx < count; idx++, id.index++, id.numid++)

		snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);



	return 0;

}



/**

 * snd_ctl_add - add the control instance to the card

 * @card: the card instance
@@ -364,45 +398,18 @@ static int snd_ctl_find_hole(struct snd_card *card, unsigned int count) 
 */

int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)

{

	struct snd_ctl_elem_id id;

	unsigned int idx;

	unsigned int count;

	int err = -EINVAL;



	if (! kcontrol)

		return err;

	if (snd_BUG_ON(!card || !kcontrol->info))

		goto error;

	id = kcontrol->id;

	if (id.index > UINT_MAX - kcontrol->count)

		goto error;



	down_write(&card->controls_rwsem);

	if (snd_ctl_find_id(card, &id)) {

		up_write(&card->controls_rwsem);

		dev_err(card->dev, "control %i:%i:%i:%s:%i is already present\n",

					id.iface,

					id.device,

					id.subdevice,

					id.name,

					id.index);

		err = -EBUSY;

		goto error;

	}

	if (snd_ctl_find_hole(card, kcontrol->count) < 0) {

	err = __snd_ctl_add(card, kcontrol);

	up_write(&card->controls_rwsem);

		err = -ENOMEM;

	if (err < 0)

		goto error;

	}

	list_add_tail(&kcontrol->list, &card->controls);

	card->controls_count += kcontrol->count;

	kcontrol->id.numid = card->last_numid + 1;

	card->last_numid += kcontrol->count;

	id = kcontrol->id;

	count = kcontrol->count;

	up_write(&card->controls_rwsem);

	for (idx = 0; idx < count; idx++, id.index++, id.numid++)

		snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);

	return 0;



 error:
@@ -1361,9 +1368,12 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, 
		kctl->tlv.c = snd_ctl_elem_user_tlv;



	/* This function manage to free the instance on failure. */

	err = snd_ctl_add(card, kctl);

	if (err < 0)

		return err;

	down_write(&card->controls_rwsem);

	err = __snd_ctl_add(card, kctl);

	if (err < 0) {

		snd_ctl_free_one(kctl);

		goto unlock;

	}

	offset = snd_ctl_get_ioff(kctl, &info->id);

	snd_ctl_build_ioff(&info->id, kctl, offset);

	/*
@@ -1374,10 +1384,10 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, 
	 * which locks the element.

	 */



	down_write(&card->controls_rwsem);

	card->user_ctl_count++;

	up_write(&card->controls_rwsem);



 unlock:

	up_write(&card->controls_rwsem);

	return 0;

}

sound/isa/wss/wss_lib.c

+0 −2
Original line number Diff line number Diff line
@@ -1531,7 +1531,6 @@ static int snd_wss_playback_open(struct snd_pcm_substream *substream) 
	if (err < 0) {

		if (chip->release_dma)

			chip->release_dma(chip, chip->dma_private_data, chip->dma1);

		snd_free_pages(runtime->dma_area, runtime->dma_bytes);

		return err;

	}

	chip->playback_substream = substream;
@@ -1572,7 +1571,6 @@ static int snd_wss_capture_open(struct snd_pcm_substream *substream) 
	if (err < 0) {

		if (chip->release_dma)

			chip->release_dma(chip, chip->dma_private_data, chip->dma2);

		snd_free_pages(runtime->dma_area, runtime->dma_bytes);

		return err;

	}

	chip->capture_substream = substream;

sound/pci/ac97/ac97_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ static int snd_ac97_put_spsa(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_ 
{

	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);

	int reg = kcontrol->private_value & 0xff;

	int shift = (kcontrol->private_value >> 8) & 0xff;

	int shift = (kcontrol->private_value >> 8) & 0x0f;

	int mask = (kcontrol->private_value >> 16) & 0xff;

	// int invert = (kcontrol->private_value >> 24) & 0xff;

	unsigned short value, old, new;

sound/pci/hda/hda_intel.c

+2 −0
Original line number Diff line number Diff line
@@ -2169,6 +2169,8 @@ static struct snd_pci_quirk power_save_blacklist[] = { 
	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */

	SND_PCI_QUIRK(0x1849, 0xc892, "Asrock B85M-ITX", 0),

	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */

	SND_PCI_QUIRK(0x1849, 0x0397, "Asrock N68C-S UCC", 0),

	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */

	SND_PCI_QUIRK(0x1849, 0x7662, "Asrock H81M-HDS", 0),

	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */

	SND_PCI_QUIRK(0x1043, 0x8733, "Asus Prime X370-Pro", 0),

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -6532,6 +6532,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),

	SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC233_FIXUP_LENOVO_MULTI_CODECS),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),