upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/drivers/usb/media/dabusb.c b/drivers/usb/media/dabusb.c
index 73f826d..6ca2fae 100644 (file)
--- a/drivers/usb/media/dabusb.c
+++ b/drivers/usb/media/dabusb.c
@@ -138,8 +138,7 @@ static int dabusb_free_queue (struct list_head *q)
 #ifdef DEBUG 
                dump_urb(b->purb);
 #endif
-               if (b->purb->transfer_buffer)
-                       kfree (b->purb->transfer_buffer);
+               kfree(b->purb->transfer_buffer);
                usb_free_urb(b->purb);
                tmp = p->next;
                list_del (p);
@@ -724,13 +723,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;
 
 
@@ -746,7 +748,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;
        }