diff options
| author | Mariusz Kozlowski <m.kozlowski@tuxland.pl> | 2006-11-25 11:09:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-25 13:28:34 -0800 |
| commit | 9dce447a542d8b4bedf13d6a4c4fc6737240372e (patch) | |
| tree | bba4591cd3564a499481d662ed931c5be1d040c2 /drivers/usb/input/ati_remote.c | |
| parent | cfd3ef2346f924d6c0e82236c20fdb3a8840136a (diff) | |
| download | op-kernel-dev-9dce447a542d8b4bedf13d6a4c4fc6737240372e.zip op-kernel-dev-9dce447a542d8b4bedf13d6a4c4fc6737240372e.tar.gz | |
[PATCH] usb: ati remote memleak fix
This is a bug. When checking for ati_remote->outbuf we free freeing
ati_remote->inbuf so we end up freeing ati_remote->inbuf twice.
Also the checks for 'ati_remote->inbuf != NULL' and 'ati_remote->outbuf !=
NULL' are redundant as usb_buffer_free() does this.
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Acked-by: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/usb/input/ati_remote.c')
| -rw-r--r-- | drivers/usb/input/ati_remote.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c index f659f30..787b847 100644 --- a/drivers/usb/input/ati_remote.c +++ b/drivers/usb/input/ati_remote.c @@ -636,13 +636,11 @@ static void ati_remote_free_buffers(struct ati_remote *ati_remote) if (ati_remote->out_urb) usb_free_urb(ati_remote->out_urb); - if (ati_remote->inbuf) - usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, - ati_remote->inbuf, ati_remote->inbuf_dma); + usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, + ati_remote->inbuf, ati_remote->inbuf_dma); - if (ati_remote->outbuf) - usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, - ati_remote->inbuf, ati_remote->outbuf_dma); + usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, + ati_remote->outbuf, ati_remote->outbuf_dma); } static void ati_remote_input_init(struct ati_remote *ati_remote) |
