diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:14:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:14:02 -0700 |
| commit | 8e9d2089723d08d51e66c5eea49253d76e27941e (patch) | |
| tree | cf15609d5eeb0c1f3a39231d8ce793d3c8ad0ed0 /drivers/net/wan/cosa.c | |
| parent | Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | Rationalize fasync return values (diff) | |
| download | linux-dev-8e9d2089723d08d51e66c5eea49253d76e27941e.tar.xz linux-dev-8e9d2089723d08d51e66c5eea49253d76e27941e.zip | |
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
* 'bkl-removal' of git://git.lwn.net/linux-2.6:
Rationalize fasync return values
Move FASYNC bit handling to f_op->fasync()
Use f_lock to protect f_flags
Rename struct file->f_ep_lock
Diffstat (limited to 'drivers/net/wan/cosa.c')
| -rw-r--r-- | drivers/net/wan/cosa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index d276d72ee3b7..61581ee5f08c 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c @@ -998,8 +998,8 @@ static struct fasync_struct *fasync[256] = { NULL, }; static int cosa_fasync(struct inode *inode, struct file *file, int on) { int port = iminor(inode); - int rv = fasync_helper(inode, file, on, &fasync[port]); - return rv < 0 ? rv : 0; + + return fasync_helper(inode, file, on, &fasync[port]); } #endif |