fedora core 2.6.10-1.12-FC2

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

diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index 79ff338..7803b91 100644 (file)
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -123,7 +123,7 @@ 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);
+               usb_kill_urb(urb);
                skb_queue_tail(&bfusb->completed_q, skb);
        }
 
@@ -680,7 +680,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
        bfusb->bulk_out_ep   = bulk_out_ep->desc.bEndpointAddress;
        bfusb->bulk_pkt_size = bulk_out_ep->desc.wMaxPacketSize;
 
-       bfusb->lock = RW_LOCK_UNLOCKED;
+       rwlock_init(&bfusb->lock);
 
        bfusb->reassembly = NULL;