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

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

Merge branch 'for-linus' into for-next 



Back-merge to the development branch for further fixes of sequencer
stuff.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 33193dca b3defb79

sound/core/pcm_lib.c

+0 −1
Original line number Diff line number Diff line
@@ -560,7 +560,6 @@ static inline unsigned int muldiv32(unsigned int a, unsigned int b, 
{

	u_int64_t n = (u_int64_t) a * b;

	if (c == 0) {

		snd_BUG_ON(!n);

		*r = 0;

		return UINT_MAX;

	}

sound/core/seq/seq_clientmgr.c

+3 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ static struct snd_seq_client *seq_create_client1(int client_index, int poolsize) 
	rwlock_init(&client->ports_lock);

	mutex_init(&client->ports_mutex);

	INIT_LIST_HEAD(&client->ports_list_head);

	mutex_init(&client->ioctl_mutex);



	/* find free slot in the client table */

	spin_lock_irqsave(&clients_lock, flags);
@@ -2130,7 +2131,9 @@ static long snd_seq_ioctl(struct file *file, unsigned int cmd, 
			return -EFAULT;

	}



	mutex_lock(&client->ioctl_mutex);

	err = handler->func(client, &buf);

	mutex_unlock(&client->ioctl_mutex);

	if (err >= 0) {

		/* Some commands includes a bug in 'dir' field. */

		if (handler->cmd == SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT ||

sound/core/seq/seq_clientmgr.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ struct snd_seq_client { 
	struct list_head ports_list_head;

	rwlock_t ports_lock;

	struct mutex ports_mutex;

	struct mutex ioctl_mutex;

	int convert32;		/* convert 32->64bit */



	/* output pool */

sound/pci/hda/patch_cirrus.c

+1 −0
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ static const struct snd_pci_quirk cs420x_fixup_tbl[] = { 
	/*SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),*/



	/* codec SSID */

	SND_PCI_QUIRK(0x106b, 0x0600, "iMac 14,1", CS420X_IMAC27_122),

	SND_PCI_QUIRK(0x106b, 0x1c00, "MacBookPro 8,1", CS420X_MBP81),

	SND_PCI_QUIRK(0x106b, 0x2000, "iMac 12,2", CS420X_IMAC27_122),

	SND_PCI_QUIRK(0x106b, 0x2800, "MacBookPro 10,1", CS420X_MBP101),

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -6295,6 +6295,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x075b, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),

	SND_PCI_QUIRK(0x1028, 0x075d, "Dell AIO", ALC298_FIXUP_SPK_VOLUME),

	SND_PCI_QUIRK(0x1028, 0x0798, "Dell Inspiron 17 7000 Gaming", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER),

	SND_PCI_QUIRK(0x1028, 0x082a, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),

	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),