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

Commit e37a97d4 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: drivers/usb/input - usb_buffer_free() cleanup 



usb_buffer_free() now handles NULLs so remove unneeded checks
form callers.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 4bdd488f

drivers/usb/input/ati_remote2.c

+1 −3
Original line number Diff line number Diff line
@@ -405,8 +405,6 @@ static void ati_remote2_urb_cleanup(struct ati_remote2 *ar2) 


	for (i = 0; i < 2; i++) {

		usb_free_urb(ar2->urb[i]);



		if (ar2->buf[i])

		usb_buffer_free(ar2->udev, 4, ar2->buf[i], ar2->buf_dma[i]);

	}

}

drivers/usb/input/powermate.c

+4 −6
Original line number Diff line number Diff line
@@ -291,10 +291,8 @@ static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_dev 


static void powermate_free_buffers(struct usb_device *udev, struct powermate_device *pm)

{

	if (pm->data)

	usb_buffer_free(udev, POWERMATE_PAYLOAD_SIZE_MAX,

			pm->data, pm->data_dma);

	if (pm->configcr)

	usb_buffer_free(udev, sizeof(*(pm->configcr)),

			pm->configcr, pm->configcr_dma);

}

drivers/usb/input/usbtouchscreen.c

+2 −3
Original line number Diff line number Diff line
@@ -668,7 +668,6 @@ static void usbtouch_close(struct input_dev *input) 
static void usbtouch_free_buffers(struct usb_device *udev,

				  struct usbtouch_usb *usbtouch)

{

	if (usbtouch->data)

	usb_buffer_free(udev, usbtouch->type->rept_size,

	                usbtouch->data, usbtouch->data_dma);

	kfree(usbtouch->buffer);

drivers/usb/input/yealink.c

+11 −12
Original line number Diff line number Diff line
@@ -818,18 +818,17 @@ static int usb_cleanup(struct yealink_dev *yld, int err) 
		else

			input_unregister_device(yld->idev);

	}

	if (yld->ctl_req)



	usb_free_urb(yld->urb_irq);

	usb_free_urb(yld->urb_ctl);



	usb_buffer_free(yld->udev, sizeof(*(yld->ctl_req)),

			yld->ctl_req, yld->ctl_req_dma);

	if (yld->ctl_data)

	usb_buffer_free(yld->udev, USB_PKT_LEN,

			yld->ctl_data, yld->ctl_dma);

	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;

}