vserver 1.9.5.x5

[linux-2.6.git] / drivers / isdn / hisax / hfc_usb.c

diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index c95d91d..fcc67af 100644 (file)
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -133,7 +133,7 @@ static const char *hfcusb_revision = "4.0";
 /**********/
 /* macros */
 /**********/
-#define write_usb(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_out_pipe,0,0x40,(c),(b),0,0,HFC_CTRL_TIMEOUT)
+#define write_usb(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_out_pipe,0,0x40,(c),(b),NULL,0,HFC_CTRL_TIMEOUT)
 #define read_usb(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_in_pipe,1,0xC0,0,(b),(c),1,HFC_CTRL_TIMEOUT)
 
 /*************************************************/
@@ -353,7 +353,7 @@ vendor_data vdata[]=
        {0x8e3, 0x0301, "Olitec USB RNIS",              LED_SCHEME1,  LED_NORMAL,   {2,0,1,4}},           /* Olitec TA  */
        {0x675, 0x1688, "DrayTec USB ISDN TA",          LED_SCHEME1,  LED_NORMAL,   {4,0,2,1}},           /* Draytec TA */
        {0x7fa, 0x0846, "Bewan Modem RNIS USB",         LED_SCHEME1,  LED_INVERTED, {8,0x40,0x20,0x10}},  /* Bewan TA   */
-       {0,0,0}                    // EOL element
+       {0}                        // EOL element
 };
                                                                                
 /***************************************************/
@@ -1360,9 +1360,10 @@ static int hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id
 //     usb_show_device_descriptor(&dev->descriptor);
 //     usb_show_interface_descriptor(&iface->desc);
        vend_idx=0xffff;
-       for(i=0;vdata[i].vendor;i++)
-       {
-               if(dev->descriptor.idVendor==vdata[i].vendor && dev->descriptor.idProduct==vdata[i].prod_id) vend_idx=i;
+       for(i=0;vdata[i].vendor;i++) {
+               if (le16_to_cpu(dev->descriptor.idVendor) == vdata[i].vendor && 
+                   le16_to_cpu(dev->descriptor.idProduct) == vdata[i].prod_id)
+                       vend_idx = i;
        }
        
 
@@ -1491,7 +1492,7 @@ static int hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id
                                                case USB_ENDPOINT_XFER_INT:
                                                        context->fifos[cidx].pipe = usb_rcvintpipe(dev, ep->desc.bEndpointAddress);
                                                        context->fifos[cidx].usb_transfer_mode = USB_INT;
-                                                       packet_size = ep->desc.wMaxPacketSize; // remember max packet size
+                                                       packet_size = le16_to_cpu(ep->desc.wMaxPacketSize); // remember max packet size
 #ifdef VERBOSE_USB_DEBUG
                                                        printk (KERN_INFO "HFC-USB: Interrupt-In Endpoint found %d ms(idx:%d cidx:%d)!\n",
                                                                ep->desc.bInterval, idx, cidx);
@@ -1503,7 +1504,7 @@ static int hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id
                                                        else
                                                                context->fifos[cidx].pipe = usb_sndbulkpipe(dev, ep->desc.bEndpointAddress);
                                                        context->fifos[cidx].usb_transfer_mode = USB_BULK;
-                                                       packet_size = ep->desc.wMaxPacketSize; // remember max packet size
+                                                       packet_size = le16_to_cpu(ep->desc.wMaxPacketSize); // remember max packet size
 #ifdef VERBOSE_USB_DEBUG
                                                        printk (KERN_INFO "HFC-USB: Bulk Endpoint found (idx:%d cidx:%d)!\n",
                                                                idx, cidx);
@@ -1515,7 +1516,7 @@ static int hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id
                                                        else
                                                                context->fifos[cidx].pipe = usb_sndisocpipe(dev, ep->desc.bEndpointAddress);
                                                        context->fifos[cidx].usb_transfer_mode = USB_ISOC;
-                                                       iso_packet_size = ep->desc.wMaxPacketSize; // remember max packet size
+                                                       iso_packet_size = le16_to_cpu(ep->desc.wMaxPacketSize); // remember max packet size
 #ifdef VERBOSE_USB_DEBUG
                                                        printk (KERN_INFO "HFC-USB: ISO Endpoint found (idx:%d cidx:%d)!\n",
                                                                idx, cidx);
@@ -1528,7 +1529,7 @@ static int hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id
                                        if (context->fifos[cidx].pipe) {
                                                context->fifos[cidx].fifonum = cidx;
                                                context->fifos[cidx].hfc = context;
-                                               context->fifos[cidx].usb_packet_maxlen = ep->desc.wMaxPacketSize;
+                                               context->fifos[cidx].usb_packet_maxlen = le16_to_cpu(ep->desc.wMaxPacketSize);
                                                context->fifos[cidx].intervall = ep->desc.bInterval;
                                                context->fifos[cidx].skbuff = NULL;
 #ifdef VERBOSE_USB_DEBUG