diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:02:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:02:41 +0800 |
| commit | 5cc3b58828a8bb2ebb34de96d1aec1564f912a31 (patch) | |
| tree | 2694db57173168b3a222c25c3372cdef0b17924f /sound/core/seq/oss/seq_oss_init.c | |
| parent | c24745baffdb7143d6f345659fb6d781b070ca50 (diff) | |
| parent | 7f30737678023b5becaf0e2e012665f71b886a7d (diff) | |
Merge tag 'v4.1.20' into linux-linaro-lsk-v4.1lsk-v4.1-16.03
This is the 4.1.20 stable release
Diffstat (limited to 'sound/core/seq/oss/seq_oss_init.c')
| -rw-r--r-- | sound/core/seq/oss/seq_oss_init.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sound/core/seq/oss/seq_oss_init.c b/sound/core/seq/oss/seq_oss_init.c index dad5b1123e46..0b9c18b2e45f 100644 --- a/sound/core/seq/oss/seq_oss_init.c +++ b/sound/core/seq/oss/seq_oss_init.c @@ -436,22 +436,6 @@ snd_seq_oss_release(struct seq_oss_devinfo *dp) /* - * Wait until the queue is empty (if we don't have nonblock) - */ -void -snd_seq_oss_drain_write(struct seq_oss_devinfo *dp) -{ - if (! dp->timer->running) - return; - if (is_write_mode(dp->file_mode) && !is_nonblock_mode(dp->file_mode) && - dp->writeq) { - while (snd_seq_oss_writeq_sync(dp->writeq)) - ; - } -} - - -/* * reset sequencer devices */ void |