1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c
index 24aedbb20f03..7291e7a2717b 100644
--- a/drivers/usb/input/yealink.c
+++ b/drivers/usb/input/yealink.c
@@ -46,7 +46,6 @@
  *   20050816 henk      Merge 2.6.13-rc6
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -811,12 +810,9 @@ static int usb_cleanup(struct yealink_dev *yld, int err)
         if (yld == NULL)
                 return err;
 
-        if (yld->urb_irq) {
-                usb_kill_urb(yld->urb_irq);
-                usb_free_urb(yld->urb_irq);
-        }
-        if (yld->urb_ctl)
-                usb_free_urb(yld->urb_ctl);
+        usb_kill_urb(yld->urb_irq);     /* parameter validation in core/urb */
+        usb_kill_urb(yld->urb_ctl);     /* parameter validation in core/urb */
+
         if (yld->idev) {
                 if (err)
                         input_free_device(yld->idev);
@@ -832,6 +828,9 @@ static int usb_cleanup(struct yealink_dev *yld, int err)
         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;
 }
@@ -972,7 +971,7 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                         DRIVER_VERSION, sizeof(DRIVER_VERSION));
 
         /* Register sysfs hooks (don't care about failure) */
-        sysfs_create_group(&intf->dev.kobj, &yld_attr_group);
+        ret = sysfs_create_group(&intf->dev.kobj, &yld_attr_group);
         return 0;
 }