vserver 1.9.5.x5

[linux-2.6.git] / drivers / usb / misc / uss720.c

diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 0bc5ccc..de91f8b 100644 (file)
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -44,6 +44,7 @@
 #include <linux/parport.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/delay.h>
 
 /*
  * Version Information
@@ -159,8 +160,7 @@ static int change_mode(struct parport *pp, int m)
                                if (time_after_eq (jiffies, expire))
                                        /* The FIFO is stuck. */
                                        return -EBUSY;
-                               set_current_state(TASK_INTERRUPTIBLE);
-                               schedule_timeout((HZ + 99) / 100);
+                               msleep_interruptible(10);
                                if (signal_pending (current))
                                        break;
                        }
@@ -544,7 +544,8 @@ static int uss720_probe(struct usb_interface *intf,
        int i;
 
        printk(KERN_DEBUG "uss720: probe: vendor id 0x%x, device id 0x%x\n",
-              usbdev->descriptor.idVendor, usbdev->descriptor.idProduct);
+              le16_to_cpu(usbdev->descriptor.idVendor),
+              le16_to_cpu(usbdev->descriptor.idProduct));
 
        /* our known interfaces have 3 alternate settings */
        if (intf->num_altsetting != 3)