commit e37a97d44038700ff8c2f1080f71fdfc3a4c0c1e
author Dmitry Torokhov <dtor@insightbb.com> Thu May 03 00:57:29 2007 -0400
committer Dmitry Torokhov <dtor@insightbb.com> Thu May 03 00:57:29 2007 -0400
tree c78b612f6cca1efd305743c4bdce237f06975965
parent 4bdd488f4bf7dc91b371fe160a4718b0a91bb2a4

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

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

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

drivers/usb/input/yealink.c

diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c
index c54f1a5..fc645b2 100644
--- a/drivers/usb/input/yealink.c
+++ b/drivers/usb/input/yealink.c
@@ -818,18 +818,17 @@
 		else
 			input_unregister_device(yld->idev);
 	}
-	if (yld->ctl_req)
-		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 */
+	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);
+	usb_buffer_free(yld->udev, USB_PKT_LEN,
+			yld->ctl_data, yld->ctl_dma);
+	usb_buffer_free(yld->udev, USB_PKT_LEN,
+			yld->irq_data, yld->irq_dma);
+
 	kfree(yld);
 	return err;
 }