Skip to content

Commit

Permalink
USB: Fix unload oops and memory leak in yealink driver
Browse files Browse the repository at this point in the history
This patch fixes a memory leak and a kernel oops when trying to unload
the driver, due to an unbalanced cleanup.
Thanks Ivar Jensen for spotting my mistake.

Signed-off-by: Henk Vergonet <henk.vergonet@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Henk Vergonet authored and Greg Kroah-Hartman committed Sep 12, 2006
1 parent 5992583 commit 3e2aac3
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/usb/input/yealink.c
Original file line number Diff line number Diff line change
Expand Up @@ -810,12 +810,9 @@ static int usb_cleanup(struct yealink_dev *yld, int err)
if (yld == NULL)
return err;

if (yld->urb_irq) {
usb_kill_urb(yld->urb_irq);
usb_free_urb(yld->urb_irq);
}
if (yld->urb_ctl)
usb_free_urb(yld->urb_ctl);
usb_kill_urb(yld->urb_irq); /* parameter validation in core/urb */
usb_kill_urb(yld->urb_ctl); /* parameter validation in core/urb */

if (yld->idev) {
if (err)
input_free_device(yld->idev);
Expand All @@ -831,6 +828,9 @@ static int usb_cleanup(struct yealink_dev *yld, int err)
if (yld->irq_data)
usb_buffer_free(yld->udev, USB_PKT_LEN,
yld->irq_data, yld->irq_dma);

usb_free_urb(yld->urb_irq); /* parameter validation in core/urb */
usb_free_urb(yld->urb_ctl); /* parameter validation in core/urb */
kfree(yld);
return err;
}
Expand Down

0 comments on commit 3e2aac3

Please sign in to comment.