This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c
index f491d76..61a42bd 100644 (file)
--- a/drivers/usb/input/ati_remote.c
+++ b/drivers/usb/input/ati_remote.c
@@ -102,7 +102,6 @@
 #define ATI_REMOTE_VENDOR_ID   0x0bc7
 #define ATI_REMOTE_PRODUCT_ID  0x004
 #define LOLA_REMOTE_PRODUCT_ID         0x002
-#define MEDION_REMOTE_PRODUCT_ID 0x006
 
 #define DRIVER_VERSION                 "2.2.1"
 #define DRIVER_AUTHOR           "Torrey Hoffman <thoffman@arnor.net>"
@@ -127,7 +126,6 @@ MODULE_PARM_DESC(debug, "Enable extra debug messages and information");
 static struct usb_device_id ati_remote_table[] = {
        { USB_DEVICE(ATI_REMOTE_VENDOR_ID, ATI_REMOTE_PRODUCT_ID) },
        { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA_REMOTE_PRODUCT_ID) },
-       { USB_DEVICE(ATI_REMOTE_VENDOR_ID, MEDION_REMOTE_PRODUCT_ID) },
        {}      /* Terminating entry */
 };
 
@@ -420,14 +418,13 @@ static int ati_remote_sendpacket(struct ati_remote *ati_remote, u16 cmd, unsigne
 
        while (timeout && (ati_remote->out_urb->status == -EINPROGRESS) 
               && !(ati_remote->send_flags & SEND_FLAG_COMPLETE)) {
-               set_current_state(TASK_INTERRUPTIBLE);
                timeout = schedule_timeout(timeout);
                rmb();
        }
 
        set_current_state(TASK_RUNNING);
        remove_wait_queue(&ati_remote->wait, &wait);
-       usb_kill_urb(ati_remote->out_urb);
+       usb_unlink_urb(ati_remote->out_urb);
        
        return retval;
 }
@@ -627,10 +624,10 @@ static void ati_remote_delete(struct ati_remote *ati_remote)
        if (!ati_remote) return;
 
        if (ati_remote->irq_urb)
-               usb_kill_urb(ati_remote->irq_urb);
+               usb_unlink_urb(ati_remote->irq_urb);
 
        if (ati_remote->out_urb)
-               usb_kill_urb(ati_remote->out_urb);
+               usb_unlink_urb(ati_remote->out_urb);
 
        input_unregister_device(&ati_remote->idev);
 
@@ -732,8 +729,7 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de
        /* See if the offered device matches what we can accept */
        if ((udev->descriptor.idVendor != ATI_REMOTE_VENDOR_ID) ||
                ( (udev->descriptor.idProduct != ATI_REMOTE_PRODUCT_ID) &&
-                 (udev->descriptor.idProduct != LOLA_REMOTE_PRODUCT_ID) &&
-                 (udev->descriptor.idProduct != MEDION_REMOTE_PRODUCT_ID) ))
+                 (udev->descriptor.idProduct != LOLA_REMOTE_PRODUCT_ID) ))
                return -ENODEV;
 
        /* Allocate and clear an ati_remote struct */