Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+17 -17
+17 -17
drivers/input/joystick/xpad.c
··· 444 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 464 #if defined(CONFIG_JOYSTICK_XPAD_FF) || defined(CONFIG_JOYSTICK_XPAD_LEDS) 448 465 static void xpad_irq_out(struct urb *urb) 449 466 { ··· 490 473 if (retval) 491 474 err("%s - usb_submit_urb failed with result %d", 492 475 __FUNCTION__, retval); 493 - } 494 - 495 - static void xpad_bulk_out(struct urb *urb) 496 - { 497 - switch (urb->status) { 498 - case 0: 499 - /* success */ 500 - break; 501 - case -ECONNRESET: 502 - case -ENOENT: 503 - case -ESHUTDOWN: 504 - /* this urb is terminated, clean up */ 505 - dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); 506 - break; 507 - default: 508 - dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); 509 - } 510 476 } 511 477 512 478 static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)