patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / bluetooth / bfusb.c

diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index 81c216e..45e35bc 100644 (file)
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -98,14 +98,6 @@ struct bfusb_scb {
 static void bfusb_tx_complete(struct urb *urb, struct pt_regs *regs);
 static void bfusb_rx_complete(struct urb *urb, struct pt_regs *regs);
 
-static inline void bfusb_wait_for_urb(struct urb *urb)
-{
-       while (atomic_read(&urb->count) > 1) {
-               current->state = TASK_UNINTERRUPTIBLE;
-               schedule_timeout((5 * HZ + 999) / 1000);
-       }
-}
-
 static struct urb *bfusb_get_completed(struct bfusb *bfusb)
 {
        struct sk_buff *skb;
@@ -132,7 +124,6 @@ static void bfusb_unlink_urbs(struct bfusb *bfusb)
        while ((skb = skb_dequeue(&bfusb->pending_q))) {
                urb = ((struct bfusb_scb *) skb->cb)->urb;
                usb_unlink_urb(urb);
-               bfusb_wait_for_urb(urb);
                skb_queue_tail(&bfusb->completed_q, skb);
        }
 
@@ -661,11 +652,11 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
        BT_DBG("intf %p id %p", intf, id);
 
        /* Check number of endpoints */
-       if (intf->altsetting[0].desc.bNumEndpoints < 2)
+       if (intf->cur_altsetting->desc.bNumEndpoints < 2)
                return -EIO;
 
-       bulk_out_ep = &intf->altsetting[0].endpoint[0];
-       bulk_in_ep  = &intf->altsetting[0].endpoint[1];
+       bulk_out_ep = &intf->cur_altsetting->endpoint[0];
+       bulk_in_ep  = &intf->cur_altsetting->endpoint[1];
 
        if (!bulk_out_ep || !bulk_in_ep) {
                BT_ERR("Bulk endpoints not found");