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

Commit 0004654f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

   - More coverage of USB-audio descriptor sanity checks

   - A fix for mute LED regression on Conexant HD-audio codecs

   - A few device-specific fixes and quirks for USB-audio and HD-audio

   - A fix for (die-hard remaining) possible race in sequencer core

   - FireWire oxfw regression fix that was introduced in 5.3-rc1"

* tag 'sound-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: oxfw: fix to handle correct stream for PCM playback
  ALSA: seq: Fix potential concurrent access to the deleted pool
  ALSA: usb-audio: Check mixer unit bitmap yet more strictly
  ALSA: line6: Fix memory leak at line6_init_pcm() error path
  ALSA: usb-audio: Fix invalid NULL check in snd_emuusb_set_samplerate()
  ALSA: hda/ca0132 - Add new SBZ quirk
  ALSA: usb-audio: Add implicit fb quirk for Behringer UFX1604
  ALSA: hda - Fixes inverted Conexant GPIO mic mute led
parents 452a0444 2fd23293

sound/core/seq/seq_clientmgr.c

+1 −2
Original line number Diff line number Diff line
@@ -1835,8 +1835,7 @@ static int snd_seq_ioctl_get_client_pool(struct snd_seq_client *client, 
	if (cptr->type == USER_CLIENT) {

		info->input_pool = cptr->data.user.fifo_pool_size;

		info->input_free = info->input_pool;

		if (cptr->data.user.fifo)

			info->input_free = snd_seq_unused_cells(cptr->data.user.fifo->pool);

		info->input_free = snd_seq_fifo_unused_cells(cptr->data.user.fifo);

	} else {

		info->input_pool = 0;

		info->input_free = 0;

sound/core/seq/seq_fifo.c

+17 −0
Original line number Diff line number Diff line
@@ -263,3 +263,20 @@ int snd_seq_fifo_resize(struct snd_seq_fifo *f, int poolsize) 


	return 0;

}



/* get the number of unused cells safely */

int snd_seq_fifo_unused_cells(struct snd_seq_fifo *f)

{

	unsigned long flags;

	int cells;



	if (!f)

		return 0;



	snd_use_lock_use(&f->use_lock);

	spin_lock_irqsave(&f->lock, flags);

	cells = snd_seq_unused_cells(f->pool);

	spin_unlock_irqrestore(&f->lock, flags);

	snd_use_lock_free(&f->use_lock);

	return cells;

}

sound/core/seq/seq_fifo.h

+2 −0
Original line number Diff line number Diff line
@@ -53,5 +53,7 @@ int snd_seq_fifo_poll_wait(struct snd_seq_fifo *f, struct file *file, poll_table 
/* resize pool in fifo */

int snd_seq_fifo_resize(struct snd_seq_fifo *f, int poolsize);



/* get the number of unused cells safely */

int snd_seq_fifo_unused_cells(struct snd_seq_fifo *f);



#endif

sound/firewire/oxfw/oxfw-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static int pcm_playback_hw_params(struct snd_pcm_substream *substream, 
		unsigned int channels = params_channels(hw_params);



		mutex_lock(&oxfw->mutex);

		err = snd_oxfw_stream_reserve_duplex(oxfw, &oxfw->tx_stream,

		err = snd_oxfw_stream_reserve_duplex(oxfw, &oxfw->rx_stream,

						     rate, channels);

		if (err >= 0)

			++oxfw->substreams_count;

sound/pci/hda/patch_ca0132.c

+1 −0
Original line number Diff line number Diff line
@@ -1175,6 +1175,7 @@ static const struct snd_pci_quirk ca0132_quirks[] = { 
	SND_PCI_QUIRK(0x1028, 0x0708, "Alienware 15 R2 2016", QUIRK_ALIENWARE),

	SND_PCI_QUIRK(0x1102, 0x0010, "Sound Blaster Z", QUIRK_SBZ),

	SND_PCI_QUIRK(0x1102, 0x0023, "Sound Blaster Z", QUIRK_SBZ),

	SND_PCI_QUIRK(0x1102, 0x0027, "Sound Blaster Z", QUIRK_SBZ),

	SND_PCI_QUIRK(0x1102, 0x0033, "Sound Blaster ZxR", QUIRK_SBZ),

	SND_PCI_QUIRK(0x1458, 0xA016, "Recon3Di", QUIRK_R3DI),

	SND_PCI_QUIRK(0x1458, 0xA026, "Gigabyte G1.Sniper Z97", QUIRK_R3DI),