|
@@ -356,7 +356,7 @@ static void mousedev_free(struct mousedev *mousedev)
|
|
kfree(mousedev);
|
|
kfree(mousedev);
|
|
}
|
|
}
|
|
|
|
|
|
-static int mixdev_release(void)
|
|
|
|
|
|
+static void mixdev_release(void)
|
|
{
|
|
{
|
|
struct input_handle *handle;
|
|
struct input_handle *handle;
|
|
|
|
|
|
@@ -370,8 +370,6 @@ static int mixdev_release(void)
|
|
mousedev_free(mousedev);
|
|
mousedev_free(mousedev);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
- return 0;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
static int mousedev_release(struct inode * inode, struct file * file)
|
|
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->open) {
|
|
if (list->mousedev->minor == MOUSEDEV_MIX)
|
|
if (list->mousedev->minor == MOUSEDEV_MIX)
|
|
- return mixdev_release();
|
|
|
|
-
|
|
|
|
- if (!mousedev_mix.open) {
|
|
|
|
|
|
+ mixdev_release();
|
|
|
|
+ else if (!mousedev_mix.open) {
|
|
if (list->mousedev->exist)
|
|
if (list->mousedev->exist)
|
|
input_close_device(&list->mousedev->handle);
|
|
input_close_device(&list->mousedev->handle);
|
|
else
|
|
else
|