USB HID: usbkbd/usbmouse - handle errors when registering devices
Dmitry Torokhov [Wed, 4 Apr 2007 08:40:57 +0000 (10:40 +0200)]
Handle errors when registering input devices in usbkbd/usbmouse.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

drivers/hid/usbhid/usbkbd.c
drivers/hid/usbhid/usbmouse.c

index 3749f4a..65aa12e 100644 (file)
@@ -228,6 +228,7 @@ static int usb_kbd_probe(struct usb_interface *iface,
        struct usb_kbd *kbd;
        struct input_dev *input_dev;
        int i, pipe, maxp;
+       int error = -ENOMEM;
 
        interface = iface->cur_altsetting;
 
@@ -306,15 +307,19 @@ static int usb_kbd_probe(struct usb_interface *iface,
        kbd->led->transfer_dma = kbd->leds_dma;
        kbd->led->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP);
 
-       input_register_device(kbd->dev);
+       error = input_register_device(kbd->dev);
+       if (error)
+               goto fail2;
 
        usb_set_intfdata(iface, kbd);
        return 0;
 
-fail2: usb_kbd_free_mem(dev, kbd);
-fail1: input_free_device(input_dev);
+fail2: 
+       usb_kbd_free_mem(dev, kbd);
+fail1: 
+       input_free_device(input_dev);
        kfree(kbd);
-       return -ENOMEM;
+       return error;
 }
 
 static void usb_kbd_disconnect(struct usb_interface *intf)
index 692fd60..573776d 100644 (file)
@@ -120,6 +120,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
        struct usb_mouse *mouse;
        struct input_dev *input_dev;
        int pipe, maxp;
+       int error = -ENOMEM;
 
        interface = intf->cur_altsetting;
 
@@ -188,15 +189,21 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
        mouse->irq->transfer_dma = mouse->data_dma;
        mouse->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
-       input_register_device(mouse->dev);
+       error = input_register_device(mouse->dev);
+       if (error)
+               goto fail3;
 
        usb_set_intfdata(intf, mouse);
        return 0;
 
-fail2: usb_buffer_free(dev, 8, mouse->data, mouse->data_dma);
-fail1: input_free_device(input_dev);
+fail3: 
+       usb_free_urb(mouse->irq);
+fail2: 
+       usb_buffer_free(dev, 8, mouse->data, mouse->data_dma);
+fail1: 
+       input_free_device(input_dev);
        kfree(mouse);
-       return -ENOMEM;
+       return error;
 }
 
 static void usb_mouse_disconnect(struct usb_interface *intf)