Merge branch 'master' into for-3.12/upstream

Sync with Linus' tree to be able to apply fixup patch on top
of 9d9a04ee75 ("HID: apple: Add support for the 2013 Macbook Air")

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Jiri Kosina
2013-09-04 10:49:39 +02:00
5117 changed files with 271426 additions and 184323 deletions

View File

@@ -526,7 +526,6 @@ int hidraw_connect(struct hid_device *hid)
goto out;
}
mutex_unlock(&minors_lock);
init_waitqueue_head(&dev->wait);
spin_lock_init(&dev->list_lock);
INIT_LIST_HEAD(&dev->list);
@@ -537,6 +536,7 @@ int hidraw_connect(struct hid_device *hid)
dev->exist = 1;
hid->hidraw = dev;
mutex_unlock(&minors_lock);
out:
return result;