Merge branch 'for-linus' into for-next
Back-merge to prepare for applying more FireWire updates.
This commit is contained in:
commit
1900d947b5
sound
@ -28,19 +28,16 @@
|
|||||||
/* wait until all locks are released */
|
/* wait until all locks are released */
|
||||||
void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line)
|
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) {
|
if (atomic_read(lockp) < 0) {
|
||||||
pr_warn("ALSA: seq_lock: lock trouble [counter = %d] in %s:%d\n", atomic_read(lockp), file, line);
|
pr_warn("ALSA: seq_lock: lock trouble [counter = %d] in %s:%d\n", atomic_read(lockp), file, line);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
while (atomic_read(lockp) > 0) {
|
while (atomic_read(lockp) > 0) {
|
||||||
if (max_count == 0) {
|
if (warn_count-- == 0)
|
||||||
pr_warn("ALSA: seq_lock: timeout [%d left] in %s:%d\n", atomic_read(lockp), file, line);
|
pr_warn("ALSA: seq_lock: waiting [%d left] in %s:%d\n", atomic_read(lockp), file, line);
|
||||||
break;
|
|
||||||
}
|
|
||||||
schedule_timeout_uninterruptible(1);
|
schedule_timeout_uninterruptible(1);
|
||||||
max_count--;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ struct snd_fw_async_midi_port {
|
|||||||
|
|
||||||
struct snd_rawmidi_substream *substream;
|
struct snd_rawmidi_substream *substream;
|
||||||
snd_fw_async_midi_port_fill fill;
|
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,
|
int snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port,
|
||||||
|
Loading…
Reference in New Issue
Block a user