The patch titled
usb: legousbtower free kill urb cleanup
has been added to the -mm tree. Its filename is
usb-legousbtower-free-kill-urb-cleanup.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: usb: legousbtower free kill urb cleanup
From: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
- usb_free_urb() cleanup
- usb_kill_urb() cleanup
Signed-off-by: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/usb/misc/legousbtower.c | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff -puN drivers/usb/misc/legousbtower.c~usb-legousbtower-free-kill-urb-cleanup drivers/usb/misc/legousbtower.c
--- a/drivers/usb/misc/legousbtower.c~usb-legousbtower-free-kill-urb-cleanup
+++ a/drivers/usb/misc/legousbtower.c
@@ -317,12 +317,8 @@ static inline void tower_delete (struct
tower_abort_transfers (dev);
/* free data structures */
- if (dev->interrupt_in_urb != NULL) {
- usb_free_urb (dev->interrupt_in_urb);
- }
- if (dev->interrupt_out_urb != NULL) {
- usb_free_urb (dev->interrupt_out_urb);
- }
+ usb_free_urb (dev->interrupt_in_urb);
+ usb_free_urb (dev->interrupt_out_urb);
kfree (dev->read_buffer);
kfree (dev->interrupt_in_buffer);
kfree (dev->interrupt_out_buffer);
@@ -502,15 +498,11 @@ static void tower_abort_transfers (struc
if (dev->interrupt_in_running) {
dev->interrupt_in_running = 0;
mb();
- if (dev->interrupt_in_urb != NULL && dev->udev) {
+ if (dev->udev)
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:
dbg(2, "%s: leave", __FUNCTION__);
_
Patches currently in -mm which might be from m.kozlowski@xxxxxxxxxx are
usb-idmouse-cleanup.patch
usb-writing_usb_driver-free-urb-cleanup.patch
usb-pcwd_usb-free-urb-cleanup.patch
usb-iforce-usb-free-urb-cleanup.patch
usb-usb-gigaset-free-kill-urb-cleanup.patch
usb-cinergyt2-free-kill-urb-cleanup.patch
usb-ttusb_dec-free-urb-cleanup.patch
usb-pvrusb2-hdw-free-unlink-urb-cleanup.patch
usb-pvrusb2-io-free-urb-cleanup.patch
usb-pwc-if-free-urb-cleanup.patch
usb-sn9c102_core-free-urb-cleanup.patch
usb-quickcam_messenger-free-urb-cleanup.patch
usb-zc0301_core-free-urb-cleanup.patch
usb-irda-usb-free-urb-cleanup.patch
usb-zd1201-free-urb-cleanup.patch
usb-ati_remote-free-urb-cleanup.patch
usb-ati_remote2-free-urb-cleanup.patch
usb-hid-core-free-urb-cleanup.patch
usb-usbkbd-free-urb-cleanup.patch
usb-auerswald-free-kill-urb-cleanup-and-memleak-fix.patch
usb-phidgetkit-free-urb-cleanup.patch
usb-legousbtower-free-kill-urb-cleanup.patch
usb-phidgetmotorcontrol-free-urb-cleanup.patch
usb-catc-free-urb-cleanup.patch
usb-ftdi_sio-kill-urb-cleanup.patch
usb-io_edgeport-kill-urb-cleanup.patch
usb-keyspan-free-urb-cleanup.patch
usb-kobil_sct-kill-urb-cleanup.patch
usb-mct_u232-free-urb-cleanup.patch
usb-navman-kill-urb-cleanup.patch
usb-usb-serial-free-urb-cleanup.patch
usb-visor-kill-urb-cleanup.patch
usb-usbmidi-kill-urb-cleanup.patch
usb-usbmixer-free-kill-urb-cleanup.patch
fix-x86_64-mm-pda-current.patch
i2lib-unused-variable-cleanup.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
