forked from Minki/linux
usb: legousbtower free kill urb cleanup
Hello, - usb_free_urb() cleanup - usb_kill_urb() cleanup Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
2891a51cc2
commit
f53510e8c4
@ -317,12 +317,8 @@ static inline void tower_delete (struct lego_usb_tower *dev)
|
|||||||
tower_abort_transfers (dev);
|
tower_abort_transfers (dev);
|
||||||
|
|
||||||
/* free data structures */
|
/* free data structures */
|
||||||
if (dev->interrupt_in_urb != NULL) {
|
usb_free_urb(dev->interrupt_in_urb);
|
||||||
usb_free_urb (dev->interrupt_in_urb);
|
usb_free_urb(dev->interrupt_out_urb);
|
||||||
}
|
|
||||||
if (dev->interrupt_out_urb != NULL) {
|
|
||||||
usb_free_urb (dev->interrupt_out_urb);
|
|
||||||
}
|
|
||||||
kfree (dev->read_buffer);
|
kfree (dev->read_buffer);
|
||||||
kfree (dev->interrupt_in_buffer);
|
kfree (dev->interrupt_in_buffer);
|
||||||
kfree (dev->interrupt_out_buffer);
|
kfree (dev->interrupt_out_buffer);
|
||||||
@ -502,15 +498,11 @@ static void tower_abort_transfers (struct lego_usb_tower *dev)
|
|||||||
if (dev->interrupt_in_running) {
|
if (dev->interrupt_in_running) {
|
||||||
dev->interrupt_in_running = 0;
|
dev->interrupt_in_running = 0;
|
||||||
mb();
|
mb();
|
||||||
if (dev->interrupt_in_urb != NULL && dev->udev) {
|
if (dev->udev)
|
||||||
usb_kill_urb (dev->interrupt_in_urb);
|
usb_kill_urb (dev->interrupt_in_urb);
|
||||||
}
|
|
||||||
}
|
|
||||||
if (dev->interrupt_out_busy) {
|
|
||||||
if (dev->interrupt_out_urb != NULL && dev->udev) {
|
|
||||||
usb_kill_urb (dev->interrupt_out_urb);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
if (dev->interrupt_out_busy && dev->udev)
|
||||||
|
usb_kill_urb(dev->interrupt_out_urb);
|
||||||
|
|
||||||
exit:
|
exit:
|
||||||
dbg(2, "%s: leave", __FUNCTION__);
|
dbg(2, "%s: leave", __FUNCTION__);
|
||||||
|
Loading…
Reference in New Issue
Block a user