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

Commit ff21b250 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next

parents 1f9d3d98 3d016d57

arch/arm/boot/dts/sun8i-a33.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ 
		simple-audio-card,mclk-fs = <512>;

		simple-audio-card,aux-devs = <&codec_analog>;

		simple-audio-card,routing =

			"Left DAC", "Digital Left DAC",

			"Right DAC", "Digital Right DAC";

			"Left DAC", "AIF1 Slot 0 Left",

			"Right DAC", "AIF1 Slot 0 Right";

		status = "disabled";



		simple-audio-card,cpu {

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

+7 −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 */
@@ -264,6 +267,10 @@ int snd_seq_fifo_resize(struct snd_seq_fifo *f, int poolsize) 
	/* NOTE: overflow flag is not cleared */

	spin_unlock_irqrestore(&f->lock, flags);



	/* close the old pool and wait until all users are gone */

	snd_seq_pool_mark_closing(oldpool);

	snd_use_lock_sync(&f->use_lock);



	/* release cells in old pool */

	for (cell = oldhead; cell; cell = next) {

		next = cell->next;

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 */