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

Commit d038e3dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "This contains the collection of small fixes for 4.11 that were pending
  during my vacation:

   - a few HD-audio quirks (more Dell headset support, docking station
     support on HP laptops)

   - a regression fix for the previous ctxfi DMA mask fix

   - a correction of the new CONFIG_SND_X86 menu entry

   - a fix for the races in ALSA sequencer core spotted by syzkaller"

* tag 'sound-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Adding a group of pin definition to fix headset problem
  ALSA: seq: Fix racy cell insertions during snd_seq_pool_done()
  ALSA: x86: Make CONFIG_SND_X86 bool
  ALSA: hda - add support for docking station for HP 840 G3
  ALSA: hda - add support for docking station for HP 820 G2
  ALSA: ctxfi: Fix the incorrect check of dma_set_mask() call
parents 131fbf4f 3f307834

sound/core/seq/seq_clientmgr.c

+1 −0
Original line number Diff line number Diff line
@@ -1832,6 +1832,7 @@ static int snd_seq_ioctl_set_client_pool(struct snd_seq_client *client, 
	     info->output_pool != client->pool->size)) {

		if (snd_seq_write_pool_allocated(client)) {

			/* remove all existing cells */

			snd_seq_pool_mark_closing(client->pool);

			snd_seq_queue_client_leave_cells(client->number);

			snd_seq_pool_done(client->pool);

		}

sound/core/seq/seq_fifo.c

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ void snd_seq_fifo_delete(struct snd_seq_fifo **fifo) 
		return;

	*fifo = NULL;



	if (f->pool)

		snd_seq_pool_mark_closing(f->pool);



	snd_seq_fifo_clear(f);



	/* wake up clients if any */

sound/core/seq/seq_memory.c

+13 −4
Original line number Diff line number Diff line
@@ -415,6 +415,18 @@ int snd_seq_pool_init(struct snd_seq_pool *pool) 
	return 0;

}



/* refuse the further insertion to the pool */

void snd_seq_pool_mark_closing(struct snd_seq_pool *pool)

{

	unsigned long flags;



	if (snd_BUG_ON(!pool))

		return;

	spin_lock_irqsave(&pool->lock, flags);

	pool->closing = 1;

	spin_unlock_irqrestore(&pool->lock, flags);

}



/* remove events */

int snd_seq_pool_done(struct snd_seq_pool *pool)

{
@@ -425,10 +437,6 @@ int snd_seq_pool_done(struct snd_seq_pool *pool) 
		return -EINVAL;



	/* wait for closing all threads */

	spin_lock_irqsave(&pool->lock, flags);

	pool->closing = 1;

	spin_unlock_irqrestore(&pool->lock, flags);



	if (waitqueue_active(&pool->output_sleep))

		wake_up(&pool->output_sleep);
@@ -485,6 +493,7 @@ int snd_seq_pool_delete(struct snd_seq_pool **ppool) 
	*ppool = NULL;

	if (pool == NULL)

		return 0;

	snd_seq_pool_mark_closing(pool);

	snd_seq_pool_done(pool);

	kfree(pool);

	return 0;

sound/core/seq/seq_memory.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ static inline int snd_seq_total_cells(struct snd_seq_pool *pool) 
int snd_seq_pool_init(struct snd_seq_pool *pool);



/* done pool - free events */

void snd_seq_pool_mark_closing(struct snd_seq_pool *pool);

int snd_seq_pool_done(struct snd_seq_pool *pool);



/* create pool */

sound/pci/ctxfi/cthw20k1.c

+1 −1
Original line number Diff line number Diff line
@@ -1905,7 +1905,7 @@ static int hw_card_start(struct hw *hw) 
		return err;



	/* Set DMA transfer mask */

	if (dma_set_mask(&pci->dev, DMA_BIT_MASK(dma_bits))) {

	if (!dma_set_mask(&pci->dev, DMA_BIT_MASK(dma_bits))) {

		dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(dma_bits));

	} else {

		dma_set_mask(&pci->dev, DMA_BIT_MASK(32));