aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/dmasound
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-04-14 16:49:33 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-04-29 15:41:42 -0400
commitfca660beb875a0449bebcfe2d6696cadb4cc593c (patch)
tree85657fedcc4b351a8f0aa474151da9ac774c42cc /sound/oss/dmasound
parent79d0a3e399576c380787be5dd36be51de763af62 (diff)
dmasound_core: saner arguments for sq_fsync()
it is not (and it has never been) an ->fsync() instance... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'sound/oss/dmasound')
-rw-r--r--sound/oss/dmasound/dmasound_core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c
index c918313c2206..bac43b5b6e95 100644
--- a/sound/oss/dmasound/dmasound_core.c
+++ b/sound/oss/dmasound/dmasound_core.c
@@ -835,7 +835,7 @@ static void sq_reset(void)
835 shared_resources_initialised = 0 ; 835 shared_resources_initialised = 0 ;
836} 836}
837 837
838static int sq_fsync(struct file *filp, struct dentry *dentry) 838static int sq_fsync(void)
839{ 839{
840 int rc = 0; 840 int rc = 0;
841 int timeout = 5; 841 int timeout = 5;
@@ -874,7 +874,7 @@ static int sq_release(struct inode *inode, struct file *file)
874 874
875 if (file->f_mode & FMODE_WRITE) { 875 if (file->f_mode & FMODE_WRITE) {
876 if (write_sq.busy) 876 if (write_sq.busy)
877 rc = sq_fsync(file, file->f_path.dentry); 877 rc = sq_fsync();
878 878
879 sq_reset_output() ; /* make sure dma is stopped and all is quiet */ 879 sq_reset_output() ; /* make sure dma is stopped and all is quiet */
880 write_sq_release_buffers(); 880 write_sq_release_buffers();
@@ -1025,7 +1025,7 @@ static int sq_ioctl(struct file *file, u_int cmd, u_long arg)
1025 */ 1025 */
1026 result = 0 ; 1026 result = 0 ;
1027 if (file->f_mode & FMODE_WRITE) { 1027 if (file->f_mode & FMODE_WRITE) {
1028 result = sq_fsync(file, file->f_path.dentry); 1028 result = sq_fsync();
1029 sq_reset_output() ; 1029 sq_reset_output() ;
1030 } 1030 }
1031 /* if we are the shared resource owner then release them */ 1031 /* if we are the shared resource owner then release them */