Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xpad - fix build failure

diff --combined drivers/input/joystick/xpad.c
index 4b07bdadb81e16d9f7f0392ee6a942a81de0c78b,d1c0e720d3f5504be3085deded040604a5d65469..b29e3affb805a97126ccee39dcc867cd6e40dfe3
--- 1/drivers/input/joystick/xpad.c
--- 2/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@@ -405,11 -405,9 +405,11 @@@ static void xpad360w_process_packet(str
  static void xpad_irq_in(struct urb *urb)
  {
        struct usb_xpad *xpad = urb->context;
 -      int retval;
 +      int retval, status;
  
 -      switch (urb->status) {
 +      status = urb->status;
 +
 +      switch (status) {
        case 0:
                /* success */
                break;
@@@ -418,11 -416,11 +418,11 @@@
        case -ESHUTDOWN:
                /* this urb is terminated, clean up */
                dbg("%s - urb shutting down with status: %d",
 -                      __FUNCTION__, urb->status);
 +                      __FUNCTION__, status);
                return;
        default:
                dbg("%s - nonzero urb status received: %d",
 -                      __FUNCTION__, urb->status);
 +                      __FUNCTION__, status);
                goto exit;
        }
  
@@@ -444,14 -442,29 +444,31 @@@ exit
                     __FUNCTION__, retval);
  }
  
+ static void xpad_bulk_out(struct urb *urb)
+ {
+       switch (urb->status) {
+       case 0:
+               /* success */
+               break;
+       case -ECONNRESET:
+       case -ENOENT:
+       case -ESHUTDOWN:
+               /* this urb is terminated, clean up */
+               dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
+               break;
+       default:
+               dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
+       }
+ }
+ 
  #if defined(CONFIG_JOYSTICK_XPAD_FF) || defined(CONFIG_JOYSTICK_XPAD_LEDS)
  static void xpad_irq_out(struct urb *urb)
  {
 -      int retval;
 +      int retval, status;
  
 -      switch (urb->status) {
 +      status = urb->status;
 +
 +      switch (status) {
                case 0:
                /* success */
                break;
@@@ -460,11 -473,11 +477,11 @@@
                case -ESHUTDOWN:
                        /* this urb is terminated, clean up */
                        dbg("%s - urb shutting down with status: %d",
 -                              __FUNCTION__, urb->status);
 +                              __FUNCTION__, status);
                        return;
                default:
                        dbg("%s - nonzero urb status received: %d",
 -                              __FUNCTION__, urb->status);
 +                              __FUNCTION__, status);
                        goto exit;
        }
  
@@@ -475,23 -488,6 +492,6 @@@ exit
                    __FUNCTION__, retval);
  }
  
- static void xpad_bulk_out(struct urb *urb)
- {
-       switch (urb->status) {
-       case 0:
-               /* success */
-               break;
-       case -ECONNRESET:
-       case -ENOENT:
-       case -ESHUTDOWN:
-               /* this urb is terminated, clean up */
-               dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
-               break;
-       default:
-               dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
-       }
- }
- 
  static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
  {
        struct usb_endpoint_descriptor *ep_irq_out;