From c66ab214dc60893bbb46f674010a1bf687d6d454 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 14 Apr 2013 16:49:33 -0400 Subject: [PATCH] --- yaml --- r: 370063 b: refs/heads/master c: fca660beb875a0449bebcfe2d6696cadb4cc593c h: refs/heads/master i: 370061: 0e306d1a492a96d993a6f75dd514e33727c6c046 370059: aeface7de3d0dbb8eb3b71f7a5cb6d698f18ab8c 370055: c4efbecd81dbe1229e207a1727ffd9bb7cf6cfd6 370047: 681d71d4ef83f1713be70e1641cc518b518a2f92 v: v3 --- [refs] | 2 +- trunk/sound/oss/dmasound/dmasound_core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f6e485d8568f..b6baf3ad21ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79d0a3e399576c380787be5dd36be51de763af62 +refs/heads/master: fca660beb875a0449bebcfe2d6696cadb4cc593c diff --git a/trunk/sound/oss/dmasound/dmasound_core.c b/trunk/sound/oss/dmasound/dmasound_core.c index c918313c2206..bac43b5b6e95 100644 --- a/trunk/sound/oss/dmasound/dmasound_core.c +++ b/trunk/sound/oss/dmasound/dmasound_core.c @@ -835,7 +835,7 @@ static void sq_reset(void) shared_resources_initialised = 0 ; } -static int sq_fsync(struct file *filp, struct dentry *dentry) +static int sq_fsync(void) { int rc = 0; int timeout = 5; @@ -874,7 +874,7 @@ static int sq_release(struct inode *inode, struct file *file) if (file->f_mode & FMODE_WRITE) { if (write_sq.busy) - rc = sq_fsync(file, file->f_path.dentry); + rc = sq_fsync(); sq_reset_output() ; /* make sure dma is stopped and all is quiet */ write_sq_release_buffers(); @@ -1025,7 +1025,7 @@ static int sq_ioctl(struct file *file, u_int cmd, u_long arg) */ result = 0 ; if (file->f_mode & FMODE_WRITE) { - result = sq_fsync(file, file->f_path.dentry); + result = sq_fsync(); sq_reset_output() ; } /* if we are the shared resource owner then release them */