This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / usb / input / powermate.c

diff --git a/drivers/usb/input/powermate.c b/drivers/usb/input/powermate.c
index 01384f5..0ba1bcb 100644 (file)
--- a/drivers/usb/input/powermate.c
+++ b/drivers/usb/input/powermate.c
@@ -349,7 +349,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
                return -ENOMEM;
        }
 
-       spin_lock_init(&pm->lock);
+       pm->lock = SPIN_LOCK_UNLOCKED;
        init_input_dev(&pm->input);
 
        /* get a handle to the interrupt data pipe */
@@ -417,7 +417,7 @@ static void powermate_disconnect(struct usb_interface *intf)
        usb_set_intfdata(intf, NULL);
        if (pm) {
                pm->requires_update = 0;
-               usb_kill_urb(pm->irq);
+               usb_unlink_urb(pm->irq);
                input_unregister_device(&pm->input);
                usb_free_urb(pm->irq);
                usb_free_urb(pm->config);