aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hidraw.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-01-03 19:04:09 -0500
committerJiri Kosina <jkosina@suse.cz>2009-01-03 19:04:09 -0500
commited42350e02bfcb333024949e9653d06916135cc5 (patch)
tree08e2ff6c3cb90193677e67b1f23b85d1ba775f74 /drivers/hid/hidraw.c
parent1db489b2953799d41098a891c85dea02e3c4721a (diff)
parent4dfdc46468a142216b284eea66040f49df3f7191 (diff)
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)
208 208
209 list_del(&list->node); 209 list_del(&list->node);
210 dev = hidraw_table[minor]; 210 dev = hidraw_table[minor];
211 if (!dev->open--) { 211 if (!--dev->open) {
212 if (list->hidraw->exist) 212 if (list->hidraw->exist)
213 dev->hid->ll_driver->close(dev->hid); 213 dev->hid->ll_driver->close(dev->hid);
214 else 214 else