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

Commit 1f369d16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Here are some last-minute fixes: two fixes for races in ALSA sequencer
  queue spotted by syzkaller, a revert for a regression of LINE6 driver
  (since 4.9), and a trivial new codec ID addition for Nvidia HDMI"

* tag 'sound-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - adding a new NV HDMI/DP codec ID in the driver
  ALSA: seq: Fix race at creating a queue
  Revert "ALSA: line6: Only determine control port properties if needed"
  ALSA: seq: Don't handle loop timeout at snd_seq_pool_done()
parents 7fe654dc af677166

sound/core/seq/seq_memory.c

+1 −8
Original line number Diff line number Diff line
@@ -419,7 +419,6 @@ int snd_seq_pool_done(struct snd_seq_pool *pool) 
{

	unsigned long flags;

	struct snd_seq_event_cell *ptr;

	int max_count = 5 * HZ;



	if (snd_BUG_ON(!pool))

		return -EINVAL;
@@ -432,14 +431,8 @@ int snd_seq_pool_done(struct snd_seq_pool *pool) 
	if (waitqueue_active(&pool->output_sleep))

		wake_up(&pool->output_sleep);



	while (atomic_read(&pool->counter) > 0) {

		if (max_count == 0) {

			pr_warn("ALSA: snd_seq_pool_done timeout: %d cells remain\n", atomic_read(&pool->counter));

			break;

		}

	while (atomic_read(&pool->counter) > 0)

		schedule_timeout_uninterruptible(1);

		max_count--;

	}

	

	/* release all resources */

	spin_lock_irqsave(&pool->lock, flags);

sound/core/seq/seq_queue.c

+20 −13
Original line number Diff line number Diff line
@@ -181,6 +181,8 @@ void __exit snd_seq_queues_delete(void) 
	}

}



static void queue_use(struct snd_seq_queue *queue, int client, int use);



/* allocate a new queue -

 * return queue index value or negative value for error

 */
@@ -192,11 +194,11 @@ int snd_seq_queue_alloc(int client, int locked, unsigned int info_flags) 
	if (q == NULL)

		return -ENOMEM;

	q->info_flags = info_flags;

	queue_use(q, client, 1);

	if (queue_list_add(q) < 0) {

		queue_delete(q);

		return -ENOMEM;

	}

	snd_seq_queue_use(q->queue, client, 1); /* use this queue */

	return q->queue;

}
@@ -502,19 +504,9 @@ int snd_seq_queue_timer_set_tempo(int queueid, int client, 
	return result;

}





/* use or unuse this queue -

 * if it is the first client, starts the timer.

 * if it is not longer used by any clients, stop the timer.

 */

int snd_seq_queue_use(int queueid, int client, int use)

/* use or unuse this queue */

static void queue_use(struct snd_seq_queue *queue, int client, int use)

{

	struct snd_seq_queue *queue;



	queue = queueptr(queueid);

	if (queue == NULL)

		return -EINVAL;

	mutex_lock(&queue->timer_mutex);

	if (use) {

		if (!test_and_set_bit(client, queue->clients_bitmap))

			queue->clients++;
@@ -529,6 +521,21 @@ int snd_seq_queue_use(int queueid, int client, int use) 
	} else {

		snd_seq_timer_close(queue);

	}

}



/* use or unuse this queue -

 * if it is the first client, starts the timer.

 * if it is not longer used by any clients, stop the timer.

 */

int snd_seq_queue_use(int queueid, int client, int use)

{

	struct snd_seq_queue *queue;



	queue = queueptr(queueid);

	if (queue == NULL)

		return -EINVAL;

	mutex_lock(&queue->timer_mutex);

	queue_use(queue, client, use);

	mutex_unlock(&queue->timer_mutex);

	queuefree(queue);

	return 0;

sound/pci/hda/patch_hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -3639,6 +3639,7 @@ HDA_CODEC_ENTRY(0x10de0070, "GPU 70 HDMI/DP", patch_nvhdmi), 
HDA_CODEC_ENTRY(0x10de0071, "GPU 71 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0072, "GPU 72 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de007d, "GPU 7d HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0080, "GPU 80 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0082, "GPU 82 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0083, "GPU 83 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI",	patch_nvhdmi_2ch),

sound/usb/line6/driver.c

+2 −1
Original line number Diff line number Diff line
@@ -754,8 +754,9 @@ int line6_probe(struct usb_interface *interface, 
		goto error;

	}



	if (properties->capabilities & LINE6_CAP_CONTROL) {

	line6_get_interval(line6);



	if (properties->capabilities & LINE6_CAP_CONTROL) {

		ret = line6_init_cap_control(line6);

		if (ret < 0)

			goto error;