OSDN Git Service

HID: roccat: Fix bug that prevented roccat chardev from removing devices
authorStefan Achatz <erazor_de@users.sourceforge.net>
Sun, 30 Jan 2011 12:38:30 +0000 (13:38 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 3 Feb 2011 15:37:28 +0000 (16:37 +0100)
pointer to device was cleared too early. This is fixed now.

Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-roccat.c

index 0fa23de..bbe294c 100644 (file)
@@ -356,13 +356,16 @@ void roccat_disconnect(int minor)
 
        mutex_lock(&devices_lock);
        device = devices[minor];
-       devices[minor] = NULL;
        mutex_unlock(&devices_lock);
 
        device->exist = 0; /* TODO exist maybe not needed */
 
        device_destroy(device->dev->class, MKDEV(roccat_major, minor));
 
+       mutex_lock(&devices_lock);
+       devices[minor] = NULL;
+       mutex_unlock(&devices_lock);
+       
        if (device->open) {
                hid_hw_close(device->hid);
                wake_up_interruptible(&device->wait);