1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c
index 026a587eb8dd..f843a0bcf107 100644
--- a/drivers/usb/storage/onetouch.c
+++ b/drivers/usb/storage/onetouch.c
@@ -28,7 +28,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/input.h>
 #include <linux/init.h>
@@ -136,6 +135,7 @@ int onetouch_connect_input(struct us_data *ss)
         struct usb_onetouch *onetouch;
         struct input_dev *input_dev;
         int pipe, maxp;
+        int error = -ENOMEM;
 
         interface = ss->pusb_intf->cur_altsetting;
 
@@ -212,15 +212,18 @@ int onetouch_connect_input(struct us_data *ss)
         ss->suspend_resume_hook = usb_onetouch_pm_hook;
 #endif
 
-        input_register_device(onetouch->dev);
+        error = input_register_device(onetouch->dev);
+        if (error)
+                goto fail3;
 
         return 0;
 
+ fail3: usb_free_urb(onetouch->irq);
  fail2: usb_buffer_free(udev, ONETOUCH_PKT_LEN,
                         onetouch->data, onetouch->data_dma);
  fail1: kfree(onetouch);
         input_free_device(input_dev);
-        return -ENOMEM;
+        return error;
 }
 
 void onetouch_release_input(void *onetouch_)