Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a306a65f authored by Pavel Rojtberg's avatar Pavel Rojtberg Committed by Dmitry Torokhov
Browse files

Input: xpad - remove needless bulk out URB used for LED setup 



This code was probably wrong ever since and is redundant with
xpad_send_led_command. Both try to send a similar command to the xbox360
controller. However xpad_send_led_command correctly uses the pad_nr instead
of bInterfaceNumber to select the led and re-uses the irq_out URB instead
of creating a new one.

Note that this change only affects the two supported wireless controllers.
Tested using the xbox360 wireless controller (PC).

Signed-off-by: default avatarPavel Rojtberg <rojtberg@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent e3b65174

drivers/input/joystick/xpad.c

+1 −78
Original line number Diff line number Diff line
@@ -328,9 +328,6 @@ struct usb_xpad { 
	unsigned char *idata;		/* input data */

	dma_addr_t idata_dma;



	struct urb *bulk_out;

	unsigned char *bdata;



	struct urb *irq_out;		/* urb for interrupt out report */

	unsigned char *odata;		/* output data */

	dma_addr_t odata_dma;
@@ -510,7 +507,6 @@ static void xpad360w_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned cha 
	if (data[0] & 0x08) {

		if (data[1] & 0x80) {

			xpad->pad_present = 1;

			usb_submit_urb(xpad->bulk_out, GFP_ATOMIC);

			/*

			 * Light up the segment corresponding to

			 * controller number.
@@ -672,28 +668,6 @@ static void xpad_irq_in(struct urb *urb) 
			__func__, retval);

}



static void xpad_bulk_out(struct urb *urb)

{

	struct usb_xpad *xpad = urb->context;

	struct device *dev = &xpad->intf->dev;



	switch (urb->status) {

	case 0:

		/* success */

		break;

	case -ECONNRESET:

	case -ENOENT:

	case -ESHUTDOWN:

		/* this urb is terminated, clean up */

		dev_dbg(dev, "%s - urb shutting down with status: %d\n",

			__func__, urb->status);

		break;

	default:

		dev_dbg(dev, "%s - nonzero urb status received: %d\n",

			__func__, urb->status);

	}

}



static void xpad_irq_out(struct urb *urb)

{

	struct usb_xpad *xpad = urb->context;
@@ -1229,52 +1203,6 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id 
	usb_set_intfdata(intf, xpad);



	if (xpad->xtype == XTYPE_XBOX360W) {

		/*

		 * 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) {

			error = -ENOMEM;

			goto fail7;

		}



		xpad->bdata = kzalloc(XPAD_PKT_LEN, GFP_KERNEL);

		if (!xpad->bdata) {

			error = -ENOMEM;

			goto fail8;

		}



		xpad->bdata[2] = 0x08;

		switch (intf->cur_altsetting->desc.bInterfaceNumber) {

		case 0:

			xpad->bdata[3] = 0x42;

			break;

		case 2:

			xpad->bdata[3] = 0x43;

			break;

		case 4:

			xpad->bdata[3] = 0x44;

			break;

		case 6:

			xpad->bdata[3] = 0x45;

		}



		ep_irq_in = &intf->cur_altsetting->endpoint[1].desc;

		if (usb_endpoint_is_bulk_out(ep_irq_in)) {

			usb_fill_bulk_urb(xpad->bulk_out, udev,

					  usb_sndbulkpipe(udev,

							  ep_irq_in->bEndpointAddress),

					  xpad->bdata, XPAD_PKT_LEN,

					  xpad_bulk_out, xpad);

		} else {

			usb_fill_int_urb(xpad->bulk_out, udev,

					 usb_sndintpipe(udev,

							ep_irq_in->bEndpointAddress),

					 xpad->bdata, XPAD_PKT_LEN,

					 xpad_bulk_out, xpad, 0);

		}



		/*

		 * Submit the int URB immediately rather than waiting for open

		 * because we get status messages from the device whether
@@ -1285,13 +1213,11 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id 
		xpad->irq_in->dev = xpad->udev;

		error = usb_submit_urb(xpad->irq_in, GFP_KERNEL);

		if (error)

			goto fail9;

			goto fail7;

	}



	return 0;



 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);
@@ -1315,8 +1241,6 @@ static void xpad_disconnect(struct usb_interface *intf) 
	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);

	}
@@ -1324,7 +1248,6 @@ static void xpad_disconnect(struct usb_interface *intf) 
	usb_free_coherent(xpad->udev, XPAD_PKT_LEN,

			xpad->idata, xpad->idata_dma);



	kfree(xpad->bdata);

	kfree(xpad);



	usb_set_intfdata(intf, NULL);