4 files changed, 18 insertions, 24 deletions

diff --git a/drivers/usb/input/ati_remote2.c b/drivers/usb/input/ati_remote2.c
index a9032aa3465f..1031543e5c3f 100644
--- a/drivers/usb/input/ati_remote2.c
+++ b/drivers/usb/input/ati_remote2.c
@@ -405,9 +405,7 @@ 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]);
+                usb_buffer_free(ar2->udev, 4, ar2->buf[i], ar2->buf_dma[i]);
         }
 }
 
diff --git a/drivers/usb/input/powermate.c b/drivers/usb/input/powermate.c
index 4f93a760faee..448a470d28f2 100644
--- a/drivers/usb/input/powermate.c
+++ b/drivers/usb/input/powermate.c
@@ -291,12 +291,10 @@ 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);
+        usb_buffer_free(udev, POWERMATE_PAYLOAD_SIZE_MAX,
+                        pm->data, pm->data_dma);
+        usb_buffer_free(udev, sizeof(*(pm->configcr)),
+                        pm->configcr, pm->configcr_dma);
 }
 
 /* Called whenever a USB device matching one in our supported devices table is connected */
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c
index e0829413336b..8e18e6c64777 100644
--- a/drivers/usb/input/usbtouchscreen.c
+++ b/drivers/usb/input/usbtouchscreen.c
@@ -668,9 +668,8 @@ 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);
+        usb_buffer_free(udev, usbtouch->type->rept_size,
+                        usbtouch->data, usbtouch->data_dma);
         kfree(usbtouch->buffer);
 }
 
diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c
index c54f1a5dcb4a..fc645b299189 100644
--- a/drivers/usb/input/yealink.c
+++ b/drivers/usb/input/yealink.c
@@ -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_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;
 }