diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-01-04 01:04:09 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-01-04 01:04:09 +0100 |
commit | ed42350e02bfcb333024949e9653d06916135cc5 (patch) | |
tree | 08e2ff6c3cb90193677e67b1f23b85d1ba775f74 /drivers/hid/hidraw.c | |
parent | 1db489b2953799d41098a891c85dea02e3c4721a (diff) | |
parent | 4dfdc46468a142216b284eea66040f49df3f7191 (diff) | |
download | op-kernel-dev-ed42350e02bfcb333024949e9653d06916135cc5.zip op-kernel-dev-ed42350e02bfcb333024949e9653d06916135cc5.tar.gz |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index aab5911..7324496 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 |