From: Mariusz Kozlowski - usb_free_urb() cleanup - auerbuf_setup() memleak fix - usb_kill_urb() cleanup Signed-off-by: Mariusz Kozlowski Signed-off-by: Andrew Morton --- drivers/usb/misc/auerswald.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff -puN drivers/usb/misc/auerswald.c~usb-auerswald-free-kill-urb-cleanup-and-memleak-fix drivers/usb/misc/auerswald.c --- a/drivers/usb/misc/auerswald.c~usb-auerswald-free-kill-urb-cleanup-and-memleak-fix +++ a/drivers/usb/misc/auerswald.c @@ -704,9 +704,7 @@ static void auerbuf_free (pauerbuf_t bp) { kfree(bp->bufp); kfree(bp->dr); - if (bp->urbp) { - usb_free_urb(bp->urbp); - } + usb_free_urb(bp->urbp); kfree(bp); } @@ -1155,8 +1153,7 @@ static void auerswald_int_release (pauer dbg ("auerswald_int_release"); /* stop the int endpoint */ - if (cp->inturbp) - usb_kill_urb (cp->inturbp); + usb_kill_urb(cp->inturbp); /* deallocate memory */ auerswald_int_free (cp); _