vserver 1.9.5.x5

[linux-2.6.git] / drivers / usb / media / dabusb.c

diff --git a/drivers/usb/media/dabusb.c b/drivers/usb/media/dabusb.c
index 0e5425f..8823297 100644 (file)
--- a/drivers/usb/media/dabusb.c
+++ b/drivers/usb/media/dabusb.c
@@ -109,16 +109,13 @@ static void dump_urb (struct urb *urb)
 static int dabusb_cancel_queue (pdabusb_t s, struct list_head *q)
 {
        unsigned long flags;
-       struct list_head *p;
        pbuff_t b;
 
        dbg("dabusb_cancel_queue");
 
        spin_lock_irqsave (&s->lock, flags);
 
-       for (p = q->next; p != q; p = p->next) {
-               b = list_entry (p, buff_t, buff_list);
-
+       list_for_each_entry(b, q, buff_list) {
 #ifdef DEBUG
                dump_urb(b->purb);
 #endif
@@ -598,7 +595,7 @@ static int dabusb_open (struct inode *inode, struct file *file)
                if (file->f_flags & O_NONBLOCK) {
                        return -EBUSY;
                }
-               schedule_timeout (HZ / 2);
+               msleep_interruptible(500);
 
                if (signal_pending (current)) {
                        return -EAGAIN;
@@ -727,13 +724,16 @@ static int dabusb_probe (struct usb_interface *intf,
        pdabusb_t s;
 
        dbg("dabusb: probe: vendor id 0x%x, device id 0x%x ifnum:%d",
-         usbdev->descriptor.idVendor, usbdev->descriptor.idProduct, intf->altsetting->desc.bInterfaceNumber);
+           le16_to_cpu(usbdev->descriptor.idVendor),
+           le16_to_cpu(usbdev->descriptor.idProduct),
+           intf->altsetting->desc.bInterfaceNumber);
 
        /* We don't handle multiple configurations */
        if (usbdev->descriptor.bNumConfigurations != 1)
                return -ENODEV;
 
-       if (intf->altsetting->desc.bInterfaceNumber != _DABUSB_IF && usbdev->descriptor.idProduct == 0x9999)
+       if (intf->altsetting->desc.bInterfaceNumber != _DABUSB_IF &&
+           le16_to_cpu(usbdev->descriptor.idProduct) == 0x9999)
                return -ENODEV;
 
 
@@ -749,7 +749,7 @@ static int dabusb_probe (struct usb_interface *intf,
                err("reset_configuration failed");
                goto reject;
        }
-       if (usbdev->descriptor.idProduct == 0x2131) {
+       if (le16_to_cpu(usbdev->descriptor.idProduct) == 0x2131) {
                dabusb_loadmem (s, NULL);
                goto reject;
        }