Commit 297e84c0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: core: message.c: use usb_control_msg_send() in a few places 



There are a few calls to usb_control_msg() that can be converted to use
usb_control_msg_send() instead, so do that in order to make the error
checking a bit simpler.

Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200914153756.3412156-4-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 719b8f28

drivers/usb/core/message.c

+19 −19
Original line number Diff line number Diff line
@@ -1081,7 +1081,7 @@ int usb_set_isoch_delay(struct usb_device *dev) 
	if (dev->speed < USB_SPEED_SUPER)

		return 0;



	return usb_control_msg(dev, usb_sndctrlpipe(dev, 0),

	return usb_control_msg_send(dev, 0,

			USB_REQ_SET_ISOCH_DELAY,

			USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,

			dev->hub_delay, 0, NULL, 0,
@@ -1203,13 +1203,13 @@ int usb_clear_halt(struct usb_device *dev, int pipe) 
	 * (like some ibmcam model 1 units) seem to expect hosts to make

	 * this request for iso endpoints, which can't halt!

	 */

	result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),

	result = usb_control_msg_send(dev, 0,

				      USB_REQ_CLEAR_FEATURE, USB_RECIP_ENDPOINT,

				      USB_ENDPOINT_HALT, endp, NULL, 0,

				      USB_CTRL_SET_TIMEOUT);



	/* don't un-halt or force to DATA0 except on success */

	if (result < 0)

	if (result)

		return result;



	/* NOTE:  seems like Microsoft and Apple don't bother verifying
@@ -1571,9 +1571,10 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate) 
	if (dev->quirks & USB_QUIRK_NO_SET_INTF)

		ret = -EPIPE;

	else

		ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),

				   USB_REQ_SET_INTERFACE, USB_RECIP_INTERFACE,

				   alternate, interface, NULL, 0, 5000);

		ret = usb_control_msg_send(dev, 0,

					   USB_REQ_SET_INTERFACE,

					   USB_RECIP_INTERFACE, alternate,

					   interface, NULL, 0, 5000);



	/* 9.4.10 says devices don't need this and are free to STALL the

	 * request if the interface only has one alternate setting.
@@ -1583,7 +1584,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate) 
			"manual set_interface for iface %d, alt %d\n",

			interface, alternate);

		manual = 1;

	} else if (ret < 0) {

	} else if (ret) {

		/* Re-instate the old alt setting */

		usb_hcd_alloc_bandwidth(dev, NULL, alt, iface->cur_altsetting);

		usb_enable_lpm(dev);
@@ -1707,11 +1708,10 @@ int usb_reset_configuration(struct usb_device *dev) 
		mutex_unlock(hcd->bandwidth_mutex);

		return retval;

	}

	retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),

			USB_REQ_SET_CONFIGURATION, 0,

	retval = usb_control_msg_send(dev, 0, USB_REQ_SET_CONFIGURATION, 0,

				      config->desc.bConfigurationValue, 0,

				      NULL, 0, USB_CTRL_SET_TIMEOUT);

	if (retval < 0) {

	if (retval) {

		usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);

		usb_enable_lpm(dev);

		mutex_unlock(hcd->bandwidth_mutex);
@@ -2096,10 +2096,10 @@ free_interfaces: 
	}

	kfree(new_interfaces);



	ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),

			      USB_REQ_SET_CONFIGURATION, 0, configuration, 0,

			      NULL, 0, USB_CTRL_SET_TIMEOUT);

	if (ret < 0 && cp) {

	ret = usb_control_msg_send(dev, 0, USB_REQ_SET_CONFIGURATION, 0,

				   configuration, 0, NULL, 0,

				   USB_CTRL_SET_TIMEOUT);

	if (ret && cp) {

		/*

		 * All the old state is gone, so what else can we do?

		 * The device is probably useless now anyway.

CRA Git | Maintained and supported by SUSTech CRA and CCSE