patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / net / irda / irda-usb.c

diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 8da8524..6ae10e5 100644 (file)
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -268,7 +268,7 @@ static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self)
                       speed_bulk_callback, self);
        urb->transfer_buffer_length = USB_IRDA_HEADER;
        urb->transfer_flags = URB_ASYNC_UNLINK;
-       urb->timeout = MSECS_TO_JIFFIES(100);
+       urb->timeout = msecs_to_jiffies(100);
 
        /* Irq disabled -> GFP_ATOMIC */
        if ((ret = usb_submit_urb(urb, GFP_ATOMIC))) {
@@ -412,7 +412,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
         * This is how the dongle will detect the end of packet - Jean II */
        urb->transfer_flags |= URB_ZERO_PACKET;
        /* Timeout need to be shorter than NET watchdog timer */
-       urb->timeout = MSECS_TO_JIFFIES(200);
+       urb->timeout = msecs_to_jiffies(200);
 
        /* Generate min turn time. FIXME: can we do better than this? */
        /* Trying to a turnaround time at this level is trying to measure
@@ -1311,7 +1311,7 @@ static inline struct irda_class_desc *irda_usb_find_class_desc(struct usb_interf
                IU_REQ_GET_CLASS_DESC,
                USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
                0, intf->altsetting->desc.bInterfaceNumber, desc,
-               sizeof(*desc), MSECS_TO_JIFFIES(500));
+               sizeof(*desc), msecs_to_jiffies(500));
        
        IRDA_DEBUG(1, "%s(), ret=%d\n", __FUNCTION__, ret);
        if (ret < sizeof(*desc)) {
@@ -1421,7 +1421,7 @@ static int irda_usb_probe(struct usb_interface *intf,
        }
 
        /* Find our endpoints */
-       interface = &intf->altsetting[0];
+       interface = intf->cur_altsetting;
        if(!irda_usb_parse_endpoints(self, interface->endpoint,
                                     interface->desc.bNumEndpoints)) {
                ERROR("%s(), Bogus endpoints...\n", __FUNCTION__);