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

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

Merge branch 'for-linus' into for-next

parents 30ff5957 473f4145

Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ The compatible list for this generic sound card currently: 
 "fsl,imx-audio-sgtl5000"

 (compatible with Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt)



 "fsl,imx-audio-wm8960"



Required properties:



  - compatible		: Contains one of entries in the compatible list.

include/sound/hdaudio.h

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ void snd_hdac_bus_enter_link_reset(struct hdac_bus *bus); 
void snd_hdac_bus_exit_link_reset(struct hdac_bus *bus);



void snd_hdac_bus_update_rirb(struct hdac_bus *bus);

void snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status,

int snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status,

				    void (*ack)(struct hdac_bus *,

						struct hdac_stream *));

sound/core/pcm_native.c

+14 −2
Original line number Diff line number Diff line
@@ -74,6 +74,18 @@ static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream); 
static DEFINE_RWLOCK(snd_pcm_link_rwlock);

static DECLARE_RWSEM(snd_pcm_link_rwsem);



/* Writer in rwsem may block readers even during its waiting in queue,

 * and this may lead to a deadlock when the code path takes read sem

 * twice (e.g. one in snd_pcm_action_nonatomic() and another in

 * snd_pcm_stream_lock()).  As a (suboptimal) workaround, let writer to

 * spin until it gets the lock.

 */

static inline void down_write_nonblock(struct rw_semaphore *lock)

{

	while (!down_write_trylock(lock))

		cond_resched();

}



/**

 * snd_pcm_stream_lock - Lock the PCM stream

 * @substream: PCM substream
@@ -1813,7 +1825,7 @@ static int snd_pcm_link(struct snd_pcm_substream *substream, int fd) 
		res = -ENOMEM;

		goto _nolock;

	}

	down_write(&snd_pcm_link_rwsem);

	down_write_nonblock(&snd_pcm_link_rwsem);

	write_lock_irq(&snd_pcm_link_rwlock);

	if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN ||

	    substream->runtime->status->state != substream1->runtime->status->state ||
@@ -1860,7 +1872,7 @@ static int snd_pcm_unlink(struct snd_pcm_substream *substream) 
	struct snd_pcm_substream *s;

	int res = 0;



	down_write(&snd_pcm_link_rwsem);

	down_write_nonblock(&snd_pcm_link_rwsem);

	write_lock_irq(&snd_pcm_link_rwlock);

	if (!snd_pcm_stream_linked(substream)) {

		res = -EALREADY;

sound/core/seq/seq_memory.c

+9 −4
Original line number Diff line number Diff line
@@ -383,15 +383,20 @@ int snd_seq_pool_init(struct snd_seq_pool *pool) 


	if (snd_BUG_ON(!pool))

		return -EINVAL;

	if (pool->ptr)			/* should be atomic? */

		return 0;



	pool->ptr = vmalloc(sizeof(struct snd_seq_event_cell) * pool->size);

	if (!pool->ptr)

	cellptr = vmalloc(sizeof(struct snd_seq_event_cell) * pool->size);

	if (!cellptr)

		return -ENOMEM;



	/* add new cells to the free cell list */

	spin_lock_irqsave(&pool->lock, flags);

	if (pool->ptr) {

		spin_unlock_irqrestore(&pool->lock, flags);

		vfree(cellptr);

		return 0;

	}



	pool->ptr = cellptr;

	pool->free = NULL;



	for (cell = 0; cell < pool->size; cell++) {

sound/core/seq/seq_ports.c

+8 −5
Original line number Diff line number Diff line
@@ -535,18 +535,21 @@ static void delete_and_unsubscribe_port(struct snd_seq_client *client, 
					bool is_src, bool ack)

{

	struct snd_seq_port_subs_info *grp;

	struct list_head *list;

	bool empty;



	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);

	if (is_src)

		list_del(&subs->src_list);

	else

		list_del(&subs->dest_list);

	empty = list_empty(list);

	if (!empty)

		list_del_init(list);

	grp->exclusive = 0;

	write_unlock_irq(&grp->list_lock);

	up_write(&grp->list_mutex);



	if (!empty)

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

}