diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-03 01:04:52 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2007-05-08 20:52:51 -0400 |
commit | 6675c5bd2a0ec223888b42cf97bc7dc900bf31fb (patch) | |
tree | baa178df18335195918781b449ef17bbafac5c40 /drivers/hid/usbhid/hid-core.c | |
parent | 66da876962f782a3974b4a957d12f20656584a4d (diff) |
USB HID: usb_buffer_free() cleanup
usb_buffer_free() now handles NULLs so remove unneeded checks
form callers.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid/hid-core.c')
-rw-r--r-- | drivers/hid/usbhid/hid-core.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 1c0bd481219..d06b9e70ce6 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c | |||
@@ -626,14 +626,10 @@ static void hid_free_buffers(struct usb_device *dev, struct hid_device *hid) | |||
626 | { | 626 | { |
627 | struct usbhid_device *usbhid = hid->driver_data; | 627 | struct usbhid_device *usbhid = hid->driver_data; |
628 | 628 | ||
629 | if (usbhid->inbuf) | 629 | usb_buffer_free(dev, usbhid->bufsize, usbhid->inbuf, usbhid->inbuf_dma); |
630 | usb_buffer_free(dev, usbhid->bufsize, usbhid->inbuf, usbhid->inbuf_dma); | 630 | usb_buffer_free(dev, usbhid->bufsize, usbhid->outbuf, usbhid->outbuf_dma); |
631 | if (usbhid->outbuf) | 631 | usb_buffer_free(dev, sizeof(*(usbhid->cr)), usbhid->cr, usbhid->cr_dma); |
632 | usb_buffer_free(dev, usbhid->bufsize, usbhid->outbuf, usbhid->outbuf_dma); | 632 | usb_buffer_free(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma); |
633 | if (usbhid->cr) | ||
634 | usb_buffer_free(dev, sizeof(*(usbhid->cr)), usbhid->cr, usbhid->cr_dma); | ||
635 | if (usbhid->ctrlbuf) | ||
636 | usb_buffer_free(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma); | ||
637 | } | 633 | } |
638 | 634 | ||
639 | /* | 635 | /* |