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

Commit 1900d947 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 

Back-merge to prepare for applying more FireWire updates.
parents 1e0f8f68 dfb00a56

sound/core/seq/seq_lock.c

+3 −6
Original line number Diff line number Diff line
@@ -28,19 +28,16 @@ 
/* wait until all locks are released */

void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line)

{

	int max_count = 5 * HZ;

	int warn_count = 5 * HZ;



	if (atomic_read(lockp) < 0) {

		pr_warn("ALSA: seq_lock: lock trouble [counter = %d] in %s:%d\n", atomic_read(lockp), file, line);

		return;

	}

	while (atomic_read(lockp) > 0) {

		if (max_count == 0) {

			pr_warn("ALSA: seq_lock: timeout [%d left] in %s:%d\n", atomic_read(lockp), file, line);

			break;

		}

		if (warn_count-- == 0)

			pr_warn("ALSA: seq_lock: waiting [%d left] in %s:%d\n", atomic_read(lockp), file, line);

		schedule_timeout_uninterruptible(1);

		max_count--;

	}

}

sound/firewire/lib.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct snd_fw_async_midi_port { 


	struct snd_rawmidi_substream *substream;

	snd_fw_async_midi_port_fill fill;

	unsigned int consume_bytes;

	int consume_bytes;

};



int snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port,