From d4efd408b48b8acf1dbdf39736d1623c1e058e65 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Fri, 12 Oct 2007 14:18:40 -0400
Subject: [PATCH] --- yaml --- r: 69382 b: refs/heads/master c:
 064450140f1eab959bd0eca0245f449993216074 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/input/evdev.c    | 5 ++++-
 trunk/drivers/input/joydev.c   | 5 ++++-
 trunk/drivers/input/mousedev.c | 5 ++++-
 trunk/drivers/input/tsdev.c    | 5 ++++-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 139f90b420d3..f589f84cafdc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ea3abf7fbc39b3b543d7438159ba07b6411561c
+refs/heads/master: 064450140f1eab959bd0eca0245f449993216074
diff --git a/trunk/drivers/input/evdev.c b/trunk/drivers/input/evdev.c
index bfee4f9a7715..d404aa8680ea 100644
--- a/trunk/drivers/input/evdev.c
+++ b/trunk/drivers/input/evdev.c
@@ -192,8 +192,11 @@ static int evdev_open_device(struct evdev *evdev)
 
 	if (!evdev->exist)
 		retval = -ENODEV;
-	else if (!evdev->open++)
+	else if (!evdev->open++) {
 		retval = input_open_device(&evdev->handle);
+		if (retval)
+			evdev->open--;
+	}
 
 	mutex_unlock(&evdev->mutex);
 	return retval;
diff --git a/trunk/drivers/input/joydev.c b/trunk/drivers/input/joydev.c
index a4272d63c4d6..f306c97f556d 100644
--- a/trunk/drivers/input/joydev.c
+++ b/trunk/drivers/input/joydev.c
@@ -205,8 +205,11 @@ static int joydev_open_device(struct joydev *joydev)
 
 	if (!joydev->exist)
 		retval = -ENODEV;
-	else if (!joydev->open++)
+	else if (!joydev->open++) {
 		retval = input_open_device(&joydev->handle);
+		if (retval)
+			joydev->open--;
+	}
 
 	mutex_unlock(&joydev->mutex);
 	return retval;
diff --git a/trunk/drivers/input/mousedev.c b/trunk/drivers/input/mousedev.c
index 715def79390c..cc36edbb912f 100644
--- a/trunk/drivers/input/mousedev.c
+++ b/trunk/drivers/input/mousedev.c
@@ -428,8 +428,11 @@ static int mousedev_open_device(struct mousedev *mousedev)
 		mixdev_open_devices();
 	else if (!mousedev->exist)
 		retval = -ENODEV;
-	else if (!mousedev->open++)
+	else if (!mousedev->open++) {
 		retval = input_open_device(&mousedev->handle);
+		if (retval)
+			mousedev->open--;
+	}
 
 	mutex_unlock(&mousedev->mutex);
 	return retval;
diff --git a/trunk/drivers/input/tsdev.c b/trunk/drivers/input/tsdev.c
index c189f1dd569f..120233493758 100644
--- a/trunk/drivers/input/tsdev.c
+++ b/trunk/drivers/input/tsdev.c
@@ -185,8 +185,11 @@ static int tsdev_open_device(struct tsdev *tsdev)
 
 	if (!tsdev->exist)
 		retval = -ENODEV;
-	else if (!tsdev->open++)
+	else if (!tsdev->open++) {
 		retval = input_open_device(&tsdev->handle);
+		if (retval)
+			tsdev->open--;
+	}
 
 	mutex_unlock(&tsdev->mutex);
 	return retval;