Merge branch 'next' into for-linus

Conflicts:
	include/linux/input.h

2 files changed, 74 insertions, 64 deletions

diff --git a/drivers/input/joystick/iforce/Makefile b/drivers/input/joystick/iforce/Makefile
index 74daff49ab6..bc5bda22f15 100644
--- a/drivers/input/joystick/iforce/Makefile
+++ b/drivers/input/joystick/iforce/Makefile
@@ -4,17 +4,8 @@
 # By Johann Deneux <johann.deneux@gmail.com>
 #
 
-# Goal definition
-iforce-objs     := iforce-ff.o iforce-main.o iforce-packets.o
-
 obj-$(CONFIG_JOYSTICK_IFORCE)   += iforce.o
 
-ifeq ($(CONFIG_JOYSTICK_IFORCE_232),y)
-        iforce-objs += iforce-serio.o
-endif
-
-ifeq ($(CONFIG_JOYSTICK_IFORCE_USB),y)
-        iforce-objs += iforce-usb.o
-endif
-
-EXTRA_CFLAGS = -Werror-implicit-function-declaration
+iforce-y := iforce-ff.o iforce-main.o iforce-packets.o
+iforce-$(CONFIG_JOYSTICK_IFORCE_232)    += iforce-serio.o
+iforce-$(CONFIG_JOYSTICK_IFORCE_USB)    += iforce-usb.o
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index f9fb7fa10af..56abf3d0e91 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -543,21 +543,25 @@ exit:
 static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
 {
         struct usb_endpoint_descriptor *ep_irq_out;
-        int error = -ENOMEM;
+        int error;
 
         if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX)
                 return 0;
 
         xpad->odata = usb_alloc_coherent(xpad->udev, XPAD_PKT_LEN,
                                          GFP_KERNEL, &xpad->odata_dma);
-        if (!xpad->odata)
+        if (!xpad->odata) {
+                error = -ENOMEM;
                 goto fail1;
+        }
 
         mutex_init(&xpad->odata_mutex);
 
         xpad->irq_out = usb_alloc_urb(0, GFP_KERNEL);
-        if (!xpad->irq_out)
+        if (!xpad->irq_out) {
+                error = -ENOMEM;
                 goto fail2;
+        }
 
         ep_irq_out = &intf->cur_altsetting->endpoint[1].desc;
         usb_fill_int_urb(xpad->irq_out, xpad->udev,
@@ -728,7 +732,7 @@ static void xpad_led_disconnect(struct usb_xpad *xpad)
 
         if (xpad_led) {
                 led_classdev_unregister(&xpad_led->led_cdev);
-                kfree(xpad_led->name);
+                kfree(xpad_led);
         }
 }
 #else
@@ -756,8 +760,9 @@ static void xpad_close(struct input_dev *dev)
 {
         struct usb_xpad *xpad = input_get_drvdata(dev);
 
-        if(xpad->xtype != XTYPE_XBOX360W)
+        if (xpad->xtype != XTYPE_XBOX360W)
                 usb_kill_urb(xpad->irq_in);
+
         xpad_stop_output(xpad);
 }
 
@@ -789,8 +794,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
         struct usb_xpad *xpad;
         struct input_dev *input_dev;
         struct usb_endpoint_descriptor *ep_irq_in;
-        int i;
-        int error = -ENOMEM;
+        int i, error;
 
         for (i = 0; xpad_device[i].idVendor; i++) {
                 if ((le16_to_cpu(udev->descriptor.idVendor) == xpad_device[i].idVendor) &&
@@ -800,17 +804,23 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
 
         xpad = kzalloc(sizeof(struct usb_xpad), GFP_KERNEL);
         input_dev = input_allocate_device();
-        if (!xpad || !input_dev)
+        if (!xpad || !input_dev) {
+                error = -ENOMEM;
                 goto fail1;
+        }
 
         xpad->idata = usb_alloc_coherent(udev, XPAD_PKT_LEN,
                                          GFP_KERNEL, &xpad->idata_dma);
-        if (!xpad->idata)
+        if (!xpad->idata) {
+                error = -ENOMEM;
                 goto fail1;
+        }
 
         xpad->irq_in = usb_alloc_urb(0, GFP_KERNEL);
-        if (!xpad->irq_in)
+        if (!xpad->irq_in) {
+                error = -ENOMEM;
                 goto fail2;
+        }
 
         xpad->udev = udev;
         xpad->mapping = xpad_device[i].mapping;
@@ -887,15 +897,15 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
 
         error = xpad_init_output(intf, xpad);
         if (error)
-                goto fail2;
+                goto fail3;
 
         error = xpad_init_ff(xpad);
         if (error)
-                goto fail3;
+                goto fail4;
 
         error = xpad_led_probe(xpad);
         if (error)
-                goto fail3;
+                goto fail5;
 
         ep_irq_in = &intf->cur_altsetting->endpoint[0].desc;
         usb_fill_int_urb(xpad->irq_in, udev,
@@ -907,34 +917,26 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
 
         error = input_register_device(xpad->dev);
         if (error)
-                goto fail4;
+                goto fail6;
 
         usb_set_intfdata(intf, xpad);
 
-        /*
-         * Submit the int URB immediatly rather than waiting for open
-         * because we get status messages from the device whether
-         * or not any controllers are attached.  In fact, it's
-         * exactly the message that a controller has arrived that
-         * we're waiting for.
-         */
         if (xpad->xtype == XTYPE_XBOX360W) {
-                xpad->irq_in->dev = xpad->udev;
-                error = usb_submit_urb(xpad->irq_in, GFP_KERNEL);
-                if (error)
-                        goto fail4;
-
                 /*
                  * Setup the message to set the LEDs on the
                  * controller when it shows up
                  */
                 xpad->bulk_out = usb_alloc_urb(0, GFP_KERNEL);
-                if(!xpad->bulk_out)
-                        goto fail5;
+                if (!xpad->bulk_out) {
+                        error = -ENOMEM;
+                        goto fail7;
+                }
 
                 xpad->bdata = kzalloc(XPAD_PKT_LEN, GFP_KERNEL);
-                if(!xpad->bdata)
-                        goto fail6;
+                if (!xpad->bdata) {
+                        error = -ENOMEM;
+                        goto fail8;
+                }
 
                 xpad->bdata[2] = 0x08;
                 switch (intf->cur_altsetting->desc.bInterfaceNumber) {
@@ -955,14 +957,31 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
                 usb_fill_bulk_urb(xpad->bulk_out, udev,
                                 usb_sndbulkpipe(udev, ep_irq_in->bEndpointAddress),
                                 xpad->bdata, XPAD_PKT_LEN, xpad_bulk_out, xpad);
+
+                /*
+                 * Submit the int URB immediately rather than waiting for open
+                 * because we get status messages from the device whether
+                 * or not any controllers are attached.  In fact, it's
+                 * exactly the message that a controller has arrived that
+                 * we're waiting for.
+                 */
+                xpad->irq_in->dev = xpad->udev;
+                error = usb_submit_urb(xpad->irq_in, GFP_KERNEL);
+                if (error)
+                        goto fail9;
         }
 
         return 0;
 
- fail6: usb_free_urb(xpad->bulk_out);
- fail5: usb_kill_urb(xpad->irq_in);
- fail4: usb_free_urb(xpad->irq_in);
- fail3: xpad_deinit_output(xpad);
+ fail9: kfree(xpad->bdata);
+ fail8: usb_free_urb(xpad->bulk_out);
+ fail7: input_unregister_device(input_dev);
+        input_dev = NULL;
+ fail6: xpad_led_disconnect(xpad);
+ fail5: if (input_dev)
+                input_ff_destroy(input_dev);
+ fail4: xpad_deinit_output(xpad);
+ fail3: usb_free_urb(xpad->irq_in);
  fail2: usb_free_coherent(udev, XPAD_PKT_LEN, xpad->idata, xpad->idata_dma);
  fail1: input_free_device(input_dev);
         kfree(xpad);
@@ -974,21 +993,24 @@ static void xpad_disconnect(struct usb_interface *intf)
 {
         struct usb_xpad *xpad = usb_get_intfdata (intf);
 
-        usb_set_intfdata(intf, NULL);
-        if (xpad) {
-                xpad_led_disconnect(xpad);
-                input_unregister_device(xpad->dev);
-                xpad_deinit_output(xpad);
-                if (xpad->xtype == XTYPE_XBOX360W) {
-                        usb_kill_urb(xpad->bulk_out);
-                        usb_free_urb(xpad->bulk_out);
-                        usb_kill_urb(xpad->irq_in);
-                }
-                usb_free_urb(xpad->irq_in);
-                usb_free_coherent(xpad->udev, XPAD_PKT_LEN,
-                                xpad->idata, xpad->idata_dma);
-                kfree(xpad);
+        xpad_led_disconnect(xpad);
+        input_unregister_device(xpad->dev);
+        xpad_deinit_output(xpad);
+
+        if (xpad->xtype == XTYPE_XBOX360W) {
+                usb_kill_urb(xpad->bulk_out);
+                usb_free_urb(xpad->bulk_out);
+                usb_kill_urb(xpad->irq_in);
         }
+
+        usb_free_urb(xpad->irq_in);
+        usb_free_coherent(xpad->udev, XPAD_PKT_LEN,
+                        xpad->idata, xpad->idata_dma);
+
+        kfree(xpad->bdata);
+        kfree(xpad);
+
+        usb_set_intfdata(intf, NULL);
 }
 
 static struct usb_driver xpad_driver = {
@@ -1000,10 +1022,7 @@ static struct usb_driver xpad_driver = {
 
 static int __init usb_xpad_init(void)
 {
-        int result = usb_register(&xpad_driver);
-        if (result == 0)
-                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
-        return result;
+        return usb_register(&xpad_driver);
 }
 
 static void __exit usb_xpad_exit(void)