Commit cf371fa2 authored by Borislav Petkov's avatar Borislav Petkov Committed by Greg Kroah-Hartman

[PATCH] USB: remove calls to usb_unlink_urb in class/bluetty.c

Signed-off-by: default avatarBorislav Petkov <petkov@uni-muenster.de>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent c5cefba0
...@@ -426,8 +426,8 @@ static void bluetooth_close (struct tty_struct *tty, struct file * filp) ...@@ -426,8 +426,8 @@ static void bluetooth_close (struct tty_struct *tty, struct file * filp)
bluetooth->open_count = 0; bluetooth->open_count = 0;
/* shutdown any in-flight urbs that we know about */ /* shutdown any in-flight urbs that we know about */
usb_unlink_urb (bluetooth->read_urb); usb_kill_urb (bluetooth->read_urb);
usb_unlink_urb (bluetooth->interrupt_in_urb); usb_kill_urb (bluetooth->interrupt_in_urb);
} }
up(&bluetooth->lock); up(&bluetooth->lock);
} }
...@@ -705,7 +705,7 @@ void btusb_disable_bulk_read(struct tty_struct *tty){ ...@@ -705,7 +705,7 @@ void btusb_disable_bulk_read(struct tty_struct *tty){
} }
if ((bluetooth->read_urb) && (bluetooth->read_urb->actual_length)) if ((bluetooth->read_urb) && (bluetooth->read_urb->actual_length))
usb_unlink_urb(bluetooth->read_urb); usb_kill_urb(bluetooth->read_urb);
} }
#endif #endif
...@@ -1187,14 +1187,14 @@ static void usb_bluetooth_disconnect(struct usb_interface *intf) ...@@ -1187,14 +1187,14 @@ static void usb_bluetooth_disconnect(struct usb_interface *intf)
bluetooth->open_count = 0; bluetooth->open_count = 0;
if (bluetooth->read_urb) { if (bluetooth->read_urb) {
usb_unlink_urb (bluetooth->read_urb); usb_kill_urb (bluetooth->read_urb);
usb_free_urb (bluetooth->read_urb); usb_free_urb (bluetooth->read_urb);
} }
if (bluetooth->bulk_in_buffer) if (bluetooth->bulk_in_buffer)
kfree (bluetooth->bulk_in_buffer); kfree (bluetooth->bulk_in_buffer);
if (bluetooth->interrupt_in_urb) { if (bluetooth->interrupt_in_urb) {
usb_unlink_urb (bluetooth->interrupt_in_urb); usb_kill_urb (bluetooth->interrupt_in_urb);
usb_free_urb (bluetooth->interrupt_in_urb); usb_free_urb (bluetooth->interrupt_in_urb);
} }
if (bluetooth->interrupt_in_buffer) if (bluetooth->interrupt_in_buffer)
...@@ -1204,7 +1204,7 @@ static void usb_bluetooth_disconnect(struct usb_interface *intf) ...@@ -1204,7 +1204,7 @@ static void usb_bluetooth_disconnect(struct usb_interface *intf)
for (i = 0; i < NUM_CONTROL_URBS; ++i) { for (i = 0; i < NUM_CONTROL_URBS; ++i) {
if (bluetooth->control_urb_pool[i]) { if (bluetooth->control_urb_pool[i]) {
usb_unlink_urb (bluetooth->control_urb_pool[i]); usb_kill_urb (bluetooth->control_urb_pool[i]);
if (bluetooth->control_urb_pool[i]->transfer_buffer) if (bluetooth->control_urb_pool[i]->transfer_buffer)
kfree (bluetooth->control_urb_pool[i]->transfer_buffer); kfree (bluetooth->control_urb_pool[i]->transfer_buffer);
usb_free_urb (bluetooth->control_urb_pool[i]); usb_free_urb (bluetooth->control_urb_pool[i]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment