Merge branch 'upstream-fixes' into for-next

Conflicts:

	drivers/hid/hid-ids.h
This commit is contained in:
Jiri Kosina
2009-01-04 01:04:09 +01:00
5 changed files with 10 additions and 2 deletions

View File

@@ -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