---

yaml --- r: 264763 b: refs/heads/master c: f554ff8 h: refs/heads/master i: 264761: a095d57 264759: a31f709 v: v3
git-mirror · Sep 27, 2011 · 1a5a25c · 1a5a25c
1 parent 58be3e6
commit 1a5a25c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9561f7faa45cb855b1ba83a4acf3f2ad3665e71f
+refs/heads/master: f554ff80339b4005856e6a86454d6ea2bb962ee5
diff --git a/trunk/drivers/hid/hidraw.c b/trunk/drivers/hid/hidraw.c
@@ -272,8 +272,10 @@ static int hidraw_open(struct inode *inode, struct file *file)
 	dev = hidraw_table[minor];
 	if (!dev->open++) {
 		err = hid_hw_power(dev->hid, PM_HINT_FULLON);
-		if (err < 0)
+		if (err < 0) {
+			dev->open--;
 			goto out_unlock;
+		}
 
 		err = hid_hw_open(dev->hid);
 		if (err < 0) {