Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 370063
b: refs/heads/master
c: fca660b
h: refs/heads/master
i:
  370061: 0e306d1
  370059: aeface7
  370055: c4efbec
  370047: 681d71d
v: v3
  • Loading branch information
Al Viro committed Apr 29, 2013
1 parent d4d827b commit c66ab21
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 79d0a3e399576c380787be5dd36be51de763af62
refs/heads/master: fca660beb875a0449bebcfe2d6696cadb4cc593c
6 changes: 3 additions & 3 deletions trunk/sound/oss/dmasound/dmasound_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit c66ab21

Please sign in to comment.