diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2017-02-07 09:38:44 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-02-07 09:38:44 +0100 |
| commit | 1e94320ffee29424ef70cdbb7f5601216382b7e6 (patch) | |
| tree | 5558a860abefef6d348cd586cb3aa177de0d1476 /sound | |
| parent | ALSA: x86: Refactor PCM process engine (diff) | |
| parent | Revert "ALSA: line6: Only determine control port properties if needed" (diff) | |
| download | linux-dev-1e94320ffee29424ef70cdbb7f5601216382b7e6.tar.xz linux-dev-1e94320ffee29424ef70cdbb7f5601216382b7e6.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/seq/seq_memory.c | 9 | ||||
| -rw-r--r-- | sound/usb/line6/driver.c | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index c850345c43b5..dfa5156f3585 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -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); diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index 90009c0b3a92..ab3c280a23d1 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -754,8 +754,9 @@ int line6_probe(struct usb_interface *interface, goto error; } + line6_get_interval(line6); + if (properties->capabilities & LINE6_CAP_CONTROL) { - line6_get_interval(line6); ret = line6_init_cap_control(line6); if (ret < 0) goto error; |