aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joydev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-27 17:19:16 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-27 17:19:16 -0700
commita83398570e17af6bb81eb94f4f5dd356bd2828d8 (patch)
tree5b5c7c3a56898485479291b7c964a1f3887d469c /drivers/input/joydev.c
parentsparc64: Fix MM refcount check in smp_flush_tlb_pending(). (diff)
parenti915: fix wrong 'size_t' format string (diff)
downloadlinux-dev-a83398570e17af6bb81eb94f4f5dd356bd2828d8.tar.xz
linux-dev-a83398570e17af6bb81eb94f4f5dd356bd2828d8.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/input/joydev.c')
-rw-r--r--drivers/input/joydev.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 6f2366220a50..4224f0112849 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -159,12 +159,9 @@ static void joydev_event(struct input_handle *handle,
static int joydev_fasync(int fd, struct file *file, int on)
{
- int retval;
struct joydev_client *client = file->private_data;
- retval = fasync_helper(fd, file, on, &client->fasync);
-
- return retval < 0 ? retval : 0;
+ return fasync_helper(fd, file, on, &client->fasync);
}
static void joydev_free(struct device *dev)