diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-14 09:42:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-14 09:46:02 +1000 |
| commit | 9b61c0fcdf0cfd20a85d9856d46142e7f297de0a (patch) | |
| tree | d4abe6aa3f4e1e088f9da1d0597e078b1fe58912 /sound/core/seq/oss/seq_oss.c | |
| parent | 550e3b23a53c88adfa46e64f9d442743e65d47da (diff) | |
| parent | 125234dc8b1cc862f52d8bd5b37c36cc59b2cb86 (diff) | |
| download | linux-9b61c0fcdf0cfd20a85d9856d46142e7f297de0a.tar.bz2 | |
Merge drm-fixes into drm-next.
Nouveau wanted this to avoid some worse conflicts when I merge that.
Diffstat (limited to 'sound/core/seq/oss/seq_oss.c')
| -rw-r--r-- | sound/core/seq/oss/seq_oss.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c index 8db156b207f1..8cdf489df80e 100644 --- a/sound/core/seq/oss/seq_oss.c +++ b/sound/core/seq/oss/seq_oss.c @@ -149,8 +149,6 @@ odev_release(struct inode *inode, struct file *file) if ((dp = file->private_data) == NULL) return 0; - snd_seq_oss_drain_write(dp); - mutex_lock(®ister_mutex); snd_seq_oss_release(dp); mutex_unlock(®ister_mutex); |