diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-04-14 09:01:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-04-14 09:01:04 +0200 |
| commit | 1900d947b5ebac3c9f67d45b30f1b002131b8057 (patch) | |
| tree | 9ef776e7df9f61c8de187d86fa2717b4eb09a047 | |
| parent | 1e0f8f68f764b93e8d2d0e87e23532f2186a23a1 (diff) | |
| parent | dfb00a56935186171abb5280b3407c3f910011f1 (diff) | |
Merge branch 'for-linus' into for-next
Back-merge to prepare for applying more FireWire updates.
| -rw-r--r-- | sound/core/seq/seq_lock.c | 9 | ||||
| -rw-r--r-- | sound/firewire/lib.h | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sound/core/seq/seq_lock.c b/sound/core/seq/seq_lock.c index 3b693e924db7..12ba83367b1b 100644 --- a/sound/core/seq/seq_lock.c +++ b/sound/core/seq/seq_lock.c @@ -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--; } } diff --git a/sound/firewire/lib.h b/sound/firewire/lib.h index f6769312ebfc..c3768cd494a5 100644 --- a/sound/firewire/lib.h +++ b/sound/firewire/lib.h @@ -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, |