diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-27 13:10:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-27 13:10:37 -0400 |
commit | cf867ac375cea7c7a834eaddaf373e2662d9e260 (patch) | |
tree | 09c47547433f088c29b74d401142d0629ce2dde1 /drivers/input | |
parent | 2d630d1a6827bb7266dcd8bba5f99fac2505ee97 (diff) | |
parent | 20430214cc0073dc7e817b032e32ae2ae54b4911 (diff) |
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
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/joystick/xpad.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 4b07bdadb81e..b29e3affb805 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c | |||
@@ -444,6 +444,23 @@ exit: | |||
444 | __FUNCTION__, retval); | 444 | __FUNCTION__, retval); |
445 | } | 445 | } |
446 | 446 | ||
447 | static void xpad_bulk_out(struct urb *urb) | ||
448 | { | ||
449 | switch (urb->status) { | ||
450 | case 0: | ||
451 | /* success */ | ||
452 | break; | ||
453 | case -ECONNRESET: | ||
454 | case -ENOENT: | ||
455 | case -ESHUTDOWN: | ||
456 | /* this urb is terminated, clean up */ | ||
457 | dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); | ||
458 | break; | ||
459 | default: | ||
460 | dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); | ||
461 | } | ||
462 | } | ||
463 | |||
447 | #if defined(CONFIG_JOYSTICK_XPAD_FF) || defined(CONFIG_JOYSTICK_XPAD_LEDS) | 464 | #if defined(CONFIG_JOYSTICK_XPAD_FF) || defined(CONFIG_JOYSTICK_XPAD_LEDS) |
448 | static void xpad_irq_out(struct urb *urb) | 465 | static void xpad_irq_out(struct urb *urb) |
449 | { | 466 | { |
@@ -475,23 +492,6 @@ exit: | |||
475 | __FUNCTION__, retval); | 492 | __FUNCTION__, retval); |
476 | } | 493 | } |
477 | 494 | ||
478 | static void xpad_bulk_out(struct urb *urb) | ||
479 | { | ||
480 | switch (urb->status) { | ||
481 | case 0: | ||
482 | /* success */ | ||
483 | break; | ||
484 | case -ECONNRESET: | ||
485 | case -ENOENT: | ||
486 | case -ESHUTDOWN: | ||
487 | /* this urb is terminated, clean up */ | ||
488 | dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); | ||
489 | break; | ||
490 | default: | ||
491 | dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); | ||
492 | } | ||
493 | } | ||
494 | |||
495 | static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad) | 495 | static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad) |
496 | { | 496 | { |
497 | struct usb_endpoint_descriptor *ep_irq_out; | 497 | struct usb_endpoint_descriptor *ep_irq_out; |