---

yaml --- r: 19287 b: refs/heads/master c: 74570d4 h: refs/heads/master i: 19285: 0bea435 19283: 5a55879 19279: 531b97d v: v3
git-mirror · Jan 30, 2006 · 17206ac · 17206ac
1 parent caf6bdd
commit 17206ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -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