1 files changed, 11 insertions, 9 deletions

diff --git a/drivers/usb/input/keyspan_remote.c b/drivers/usb/input/keyspan_remote.c
index 98bd323369c7..d32a7684de94 100644
--- a/drivers/usb/input/keyspan_remote.c
+++ b/drivers/usb/input/keyspan_remote.c
@@ -437,7 +437,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
         struct usb_endpoint_descriptor *endpoint;
         struct usb_keyspan *remote;
         struct input_dev *input_dev;
-        int i, retval;
+        int i, error;
 
         endpoint = keyspan_get_in_endpoint(interface->cur_altsetting);
         if (!endpoint)
@@ -446,7 +446,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
         remote = kzalloc(sizeof(*remote), GFP_KERNEL);
         input_dev = input_allocate_device();
         if (!remote || !input_dev) {
-                retval = -ENOMEM;
+                error = -ENOMEM;
                 goto fail1;
         }
 
@@ -458,19 +458,19 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
 
         remote->in_buffer = usb_buffer_alloc(udev, RECV_SIZE, GFP_ATOMIC, &remote->in_dma);
         if (!remote->in_buffer) {
-                retval = -ENOMEM;
+                error = -ENOMEM;
                 goto fail1;
         }
 
         remote->irq_urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!remote->irq_urb) {
-                retval = -ENOMEM;
+                error = -ENOMEM;
                 goto fail2;
         }
 
-        retval = keyspan_setup(udev);
-        if (retval) {
-                retval = -ENODEV;
+        error = keyspan_setup(udev);
+        if (error) {
+                error = -ENODEV;
                 goto fail3;
         }
 
@@ -517,7 +517,9 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
         remote->irq_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
         /* we can register the device now, as it is ready */
-        input_register_device(remote->input);
+        error = input_register_device(remote->input);
+        if (error)
+                goto fail3;
 
         /* save our data pointer in this interface device */
         usb_set_intfdata(interface, remote);
@@ -529,7 +531,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
  fail1: kfree(remote);
         input_free_device(input_dev);
 
-        return retval;
+        return error;
 }
 
 /*