From 17206ac335ad11772ce809b8dd53b39c66e59954 Mon Sep 17 00:00:00 2001 From: Kimball Murray Date: Sun, 29 Jan 2006 21:50:59 -0500 Subject: [PATCH] --- yaml --- r: 19287 b: refs/heads/master c: 74570d413cbb5cede06a0183a91d3006f134bf6b h: refs/heads/master i: 19285: 0bea435112e5c43804cbcc5c24b3dcb0d4c8071a 19283: 5a5587925f24c38467126baf9563757322c00537 19279: 531b97d5f88cf2d26769bb1988a51437abfb72d5 v: v3 --- [refs] | 2 +- trunk/drivers/input/mousedev.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a03acd93e675..75481d76414b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ae08f80ec5b2b08dd2f76a166140dd156fb31a1 +refs/heads/master: 74570d413cbb5cede06a0183a91d3006f134bf6b diff --git a/trunk/drivers/input/mousedev.c b/trunk/drivers/input/mousedev.c index 81fd7a97a93d..9abed18d2ecf 100644 --- a/trunk/drivers/input/mousedev.c +++ b/trunk/drivers/input/mousedev.c @@ -356,7 +356,7 @@ static void mousedev_free(struct mousedev *mousedev) kfree(mousedev); } -static int mixdev_release(void) +static void mixdev_release(void) { struct input_handle *handle; @@ -370,8 +370,6 @@ static int mixdev_release(void) mousedev_free(mousedev); } } - - return 0; } static int mousedev_release(struct inode * inode, struct file * file) @@ -384,9 +382,8 @@ static int mousedev_release(struct inode * inode, struct file * file) if (!--list->mousedev->open) { if (list->mousedev->minor == MOUSEDEV_MIX) - return mixdev_release(); - - if (!mousedev_mix.open) { + mixdev_release(); + else if (!mousedev_mix.open) { if (list->mousedev->exist) input_close_device(&list->mousedev->handle); else