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
This commit is contained in:
commit
cf867ac375
|
@ -444,6 +444,23 @@ exit:
|
||||||
__FUNCTION__, retval);
|
__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)
|
#if defined(CONFIG_JOYSTICK_XPAD_FF) || defined(CONFIG_JOYSTICK_XPAD_LEDS)
|
||||||
static void xpad_irq_out(struct urb *urb)
|
static void xpad_irq_out(struct urb *urb)
|
||||||
{
|
{
|
||||||
|
@ -475,23 +492,6 @@ exit:
|
||||||
__FUNCTION__, retval);
|
__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)
|
static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
|
||||||
{
|
{
|
||||||
struct usb_endpoint_descriptor *ep_irq_out;
|
struct usb_endpoint_descriptor *ep_irq_out;
|
||||||
|
|
Loading…
Reference in New Issue