aboutsummaryrefslogtreecommitdiff
path: root/sound/core/seq/oss/seq_oss_init.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-03-18 12:01:48 +0800
committerAlex Shi <alex.shi@linaro.org>2016-03-18 12:01:48 +0800
commit421a8ddd1fc901897eee73965b442af4b4dd7095 (patch)
treee9bd7aef46f35c1857700b9c52ad24f6a68f957c /sound/core/seq/oss/seq_oss_init.c
parent82211c838b558293e48c8fcd816f6609ebc7e4b3 (diff)
parentd439e869d612dd7a338ac75a4afc3646a5e67370 (diff)
Merge tag 'v3.18.29' into linux-linaro-lsk-v3.18lsk-v3.18-16.03
This is the 3.18.29 stable release
Diffstat (limited to 'sound/core/seq/oss/seq_oss_init.c')
-rw-r--r--sound/core/seq/oss/seq_oss_init.c16
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 beea8c861f49..acefecb1a47a 100644
--- a/sound/core/seq/oss/seq_oss_init.c
+++ b/sound/core/seq/oss/seq_oss_init.c
@@ -441,22 +441,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