This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/usb/input/usbkbd.c b/drivers/usb/input/usbkbd.c
index 1700f40..0c51b1e 100644 (file)
--- a/drivers/usb/input/usbkbd.c
+++ b/drivers/usb/input/usbkbd.c
@@ -196,7 +196,7 @@ static void usb_kbd_close(struct input_dev *dev)
        struct usb_kbd *kbd = dev->private;
 
        if (!--kbd->open)
-               usb_kill_urb(kbd->irq);
+               usb_unlink_urb(kbd->irq);
 }
 
 static int usb_kbd_alloc_mem(struct usb_device *dev, struct usb_kbd *kbd)
@@ -343,7 +343,7 @@ static void usb_kbd_disconnect(struct usb_interface *intf)
        
        usb_set_intfdata(intf, NULL);
        if (kbd) {
-               usb_kill_urb(kbd->irq);
+               usb_unlink_urb(kbd->irq);
                input_unregister_device(&kbd->dev);
                usb_kbd_free_mem(interface_to_usbdev(intf), kbd);
                kfree(kbd);