aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hidraw.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-01-04 01:04:09 +0100
committerJiri Kosina <jkosina@suse.cz>2009-01-04 01:04:09 +0100
commited42350e02bfcb333024949e9653d06916135cc5 (patch)
tree08e2ff6c3cb90193677e67b1f23b85d1ba775f74 /drivers/hid/hidraw.c
parentHID: fix default Kconfig setting for TopSpeed driver (diff)
parentHID: fix error condition propagation in hid-sony driver (diff)
downloadlinux-dev-ed42350e02bfcb333024949e9653d06916135cc5.tar.xz
linux-dev-ed42350e02bfcb333024949e9653d06916135cc5.zip
Merge branch 'upstream-fixes' into for-next
Conflicts: drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/hidraw.c')
-rw-r--r--drivers/hid/hidraw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index aab5911c4e33..732449628971 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -208,7 +208,7 @@ static int hidraw_release(struct inode * inode, struct file * file)
list_del(&list->node);
dev = hidraw_table[minor];
- if (!dev->open--) {
+ if (!--dev->open) {
if (list->hidraw->exist)
dev->hid->ll_driver->close(dev->hid);
else