The patch titled
usb: legousbtower free kill urb cleanup
has been removed from the -mm tree. Its filename was
usb-legousbtower-free-kill-urb-cleanup.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
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
origin.patch
i2lib-unused-variable-cleanup.patch
make-1-bit-bitfields-unsigned.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
