aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2005-12-13 10:32:13 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-04 13:51:42 -0800
commitf3d34ed48c80903544b509031fee64838d29f35f (patch)
treea959c2437cc15e16efca32a8827f3f303fca65f3
parent3717f2952bd0aab30fe2a6af80657abbeb065461 (diff)
[PATCH] USB: fix local variable clash
This patch (as621) fixes a local variable conflict I accidently introduced into usb_set_configuration. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/core/message.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 99ab774d4fd..319de03944e 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1387,11 +1387,11 @@ free_interfaces:
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,