From 1a5a25c9fafac0bc2940e04364487535568f0c00 Mon Sep 17 00:00:00 2001 From: Amit Nagal Date: Tue, 27 Sep 2011 13:41:58 -0400 Subject: [PATCH] --- yaml --- r: 264763 b: refs/heads/master c: f554ff80339b4005856e6a86454d6ea2bb962ee5 h: refs/heads/master i: 264761: a095d578e074f18b8f6e7e4bc970c613d8d01ca5 264759: a31f709ebb81d041b71e0b913702d1fa65e84bc6 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hidraw.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 47700aa6a101..1dd873c46e34 100644 --- 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 index a8c2b7b6220a..6d65d4e35120 100644 --- 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) {