Commit 484faec8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes:

   - A few regression fixes (PCM core fixes, USB-audio fixes)

   - Follow up fixes for the USB-audio mixer changes in this cycle

   - A long-standing ALSA sequencer race bug fix

   - Usual device-specific quirks for HD- and USB-audio"

* tag 'sound-5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: seq: Fix racy deletion of subscriber
  ALSA: memalloc: Fix regression with SNDRV_DMA_TYPE_CONTINUOUS
  ALSA: pcm - fix mmap capability check for the snd-dummy driver
  ALSA: usb-audio: Avoid unnecessary or invalid connector selection at resume
  ALSA: hda/realtek: add mic quirk for Acer SF314-42
  ALSA: usb-audio: Add registration quirk for JBL Quantum 600
  ALSA: hda/realtek: Fix headset mic for Acer SWIFT SF314-56 (ALC256)
  ALSA: usb-audio: Fix superfluous autosuspend recovery
  ALSA: usb-audio: fix incorrect clock source setting
  ALSA: scarlett2: Fix line out/speaker switching notifications
  ALSA: scarlett2: Correct channel mute status after mute button pressed
  ALSA: scarlett2: Fix Direct Monitor control name for 2i2
  ALSA: scarlett2: Fix Mute/Dim/MSD Mode control names
parents 1254f05c 97367c97

sound/core/memalloc.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int snd_dma_continuous_mmap(struct snd_dma_buffer *dmab, 
				   struct vm_area_struct *area)

{

	return remap_pfn_range(area, area->vm_start,

			       dmab->addr >> PAGE_SHIFT,

			       page_to_pfn(virt_to_page(dmab->area)),

			       area->vm_end - area->vm_start,

			       area->vm_page_prot);

}

sound/core/pcm_native.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static bool hw_support_mmap(struct snd_pcm_substream *substream) 
	if (!(substream->runtime->hw.info & SNDRV_PCM_INFO_MMAP))

		return false;



	if (substream->ops->mmap)

	if (substream->ops->mmap || substream->ops->page)

		return true;



	switch (substream->dma_buffer.dev.type) {

sound/core/seq/seq_ports.c

+27 −12
Original line number Diff line number Diff line
@@ -514,7 +514,8 @@ static int check_and_subscribe_port(struct snd_seq_client *client, 
	return err;

}



static void delete_and_unsubscribe_port(struct snd_seq_client *client,

/* called with grp->list_mutex held */

static void __delete_and_unsubscribe_port(struct snd_seq_client *client,

					  struct snd_seq_client_port *port,

					  struct snd_seq_subscribers *subs,

					  bool is_src, bool ack)
@@ -525,7 +526,6 @@ static void delete_and_unsubscribe_port(struct snd_seq_client *client, 


	grp = is_src ? &port->c_src : &port->c_dest;

	list = is_src ? &subs->src_list : &subs->dest_list;

	down_write(&grp->list_mutex);

	write_lock_irq(&grp->list_lock);

	empty = list_empty(list);

	if (!empty)
@@ -535,6 +535,18 @@ static void delete_and_unsubscribe_port(struct snd_seq_client *client, 


	if (!empty)

		unsubscribe_port(client, port, grp, &subs->info, ack);

}



static void delete_and_unsubscribe_port(struct snd_seq_client *client,

					struct snd_seq_client_port *port,

					struct snd_seq_subscribers *subs,

					bool is_src, bool ack)

{

	struct snd_seq_port_subs_info *grp;



	grp = is_src ? &port->c_src : &port->c_dest;

	down_write(&grp->list_mutex);

	__delete_and_unsubscribe_port(client, port, subs, is_src, ack);

	up_write(&grp->list_mutex);

}
@@ -590,27 +602,30 @@ int snd_seq_port_disconnect(struct snd_seq_client *connector, 
			    struct snd_seq_client_port *dest_port,

			    struct snd_seq_port_subscribe *info)

{

	struct snd_seq_port_subs_info *src = &src_port->c_src;

	struct snd_seq_port_subs_info *dest = &dest_port->c_dest;

	struct snd_seq_subscribers *subs;

	int err = -ENOENT;



	down_write(&src->list_mutex);

	/* always start from deleting the dest port for avoiding concurrent

	 * deletions

	 */

	down_write(&dest->list_mutex);

	/* look for the connection */

	list_for_each_entry(subs, &src->list_head, src_list) {

	list_for_each_entry(subs, &dest->list_head, dest_list) {

		if (match_subs_info(info, &subs->info)) {

			atomic_dec(&subs->ref_count); /* mark as not ready */

			__delete_and_unsubscribe_port(dest_client, dest_port,

						      subs, false,

						      connector->number != dest_client->number);

			err = 0;

			break;

		}

	}

	up_write(&src->list_mutex);

	up_write(&dest->list_mutex);

	if (err < 0)

		return err;



	delete_and_unsubscribe_port(src_client, src_port, subs, true,

				    connector->number != src_client->number);

	delete_and_unsubscribe_port(dest_client, dest_port, subs, false,

				    connector->number != dest_client->number);

	kfree(subs);

	return 0;

}

sound/pci/hda/patch_realtek.c

+2 −0
Original line number Diff line number Diff line
@@ -8274,9 +8274,11 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1025, 0x1290, "Acer Veriton Z4860G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),

	SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),

	SND_PCI_QUIRK(0x1025, 0x129c, "Acer SWIFT SF314-55", ALC256_FIXUP_ACER_HEADSET_MIC),

	SND_PCI_QUIRK(0x1025, 0x1300, "Acer SWIFT SF314-56", ALC256_FIXUP_ACER_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1025, 0x1308, "Acer Aspire Z24-890", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),

	SND_PCI_QUIRK(0x1025, 0x132a, "Acer TravelMate B114-21", ALC233_FIXUP_ACER_HEADSET_MIC),

	SND_PCI_QUIRK(0x1025, 0x1330, "Acer TravelMate X514-51T", ALC255_FIXUP_ACER_HEADSET_MIC),

	SND_PCI_QUIRK(0x1025, 0x142b, "Acer Swift SF314-42", ALC255_FIXUP_ACER_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1025, 0x1430, "Acer TravelMate B311R-31", ALC256_FIXUP_ACER_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1025, 0x1466, "Acer Aspire A515-56", ALC255_FIXUP_ACER_HEADPHONE_AND_MIC),

	SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),

sound/usb/card.c

+1 −1
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ static void usb_audio_disconnect(struct usb_interface *intf) 
		}

	}



	if (chip->quirk_type & QUIRK_SETUP_DISABLE_AUTOSUSPEND)

	if (chip->quirk_type == QUIRK_SETUP_DISABLE_AUTOSUSPEND)

		usb_enable_autosuspend(interface_to_usbdev(intf));



	chip->num_interfaces--;