Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6675c5bd authored May 03, 2007 by Dmitry Torokhov Committed by Jiri Kosina May 09, 2007

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>

parent 66da8769

drivers/hid/usbhid/hid-core.c

+4 −8

Original line number	Diff line number	Diff line
		@@ -626,13 +626,9 @@ static void hid_free_buffers(struct usb_device dev, struct hid_device hid)
		{
		struct usbhid_device *usbhid = hid->driver_data;

		if (usbhid->inbuf)
		usb_buffer_free(dev, usbhid->bufsize, usbhid->inbuf, usbhid->inbuf_dma);
		if (usbhid->outbuf)
		usb_buffer_free(dev, usbhid->bufsize, usbhid->outbuf, usbhid->outbuf_dma);
		if (usbhid->cr)
		usb_buffer_free(dev, sizeof(*(usbhid->cr)), usbhid->cr, usbhid->cr_dma);
		if (usbhid->ctrlbuf)
		usb_buffer_free(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma);
		}

drivers/hid/usbhid/usbkbd.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -211,11 +211,8 @@ static void usb_kbd_free_mem(struct usb_device dev, struct usb_kbd kbd)
		{
		usb_free_urb(kbd->irq);
		usb_free_urb(kbd->led);
		if (kbd->new)
		usb_buffer_free(dev, 8, kbd->new, kbd->new_dma);
		if (kbd->cr)
		usb_buffer_free(dev, sizeof(struct usb_ctrlrequest), kbd->cr, kbd->cr_dma);
		if (kbd->leds)
		usb_buffer_free(dev, 1, kbd->leds, kbd->leds_dma);
		}