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

Commit f3d34ed4 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: fix local variable clash 



This patch (as621) fixes a local variable conflict I accidently
introduced into usb_set_configuration.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3717f295

drivers/usb/core/message.c

+3 −3
Original line number Diff line number Diff line
@@ -1387,11 +1387,11 @@ int usb_set_configuration(struct usb_device *dev, int configuration) 
	if (dev->state != USB_STATE_ADDRESS)

		usb_disable_device (dev, 1);	// Skip ep0



	n = dev->bus_mA - cp->desc.bMaxPower * 2;

	if (n < 0)

	i = dev->bus_mA - cp->desc.bMaxPower * 2;

	if (i < 0)

		dev_warn(&dev->dev, "new config #%d exceeds power "

				"limit by %dmA\n",

				configuration, -n);

				configuration, -i);



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

			USB_REQ_SET_CONFIGURATION, 0, configuration, 0,