diff options
author | Amit Nagal <helloin.amit@gmail.com> | 2011-09-27 13:41:58 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-27 12:42:22 -0400 |
commit | f554ff80339b4005856e6a86454d6ea2bb962ee5 (patch) | |
tree | cb3c9c31c9d15a31a112e885176e5931630848e0 /drivers/hid | |
parent | 9561f7faa45cb855b1ba83a4acf3f2ad3665e71f (diff) |
HID: hidraw: open count should not increase if error
In hidraw_open, if hid_hw_power returns with error, hidraw device open count
should not increase.
Signed-off-by: Amit Nagal <helloin.amit@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hidraw.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index a8c2b7b6220a..6d65d4e35120 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c | |||
@@ -272,8 +272,10 @@ static int hidraw_open(struct inode *inode, struct file *file) | |||
272 | dev = hidraw_table[minor]; | 272 | dev = hidraw_table[minor]; |
273 | if (!dev->open++) { | 273 | if (!dev->open++) { |
274 | err = hid_hw_power(dev->hid, PM_HINT_FULLON); | 274 | err = hid_hw_power(dev->hid, PM_HINT_FULLON); |
275 | if (err < 0) | 275 | if (err < 0) { |
276 | dev->open--; | ||
276 | goto out_unlock; | 277 | goto out_unlock; |
278 | } | ||
277 | 279 | ||
278 | err = hid_hw_open(dev->hid); | 280 | err = hid_hw_open(dev->hid); |
279 | if (err < 0) { | 281 | if (err < 0) { |