From: Alan Stern Date: Tue, 13 Dec 2005 15:32:13 +0000 (-0500) Subject: [PATCH] USB: fix local variable clash X-Git-Tag: v2.6.16-rc1~474^2~22^2~10^2~19 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=f3d34ed48c80903544b509031fee64838d29f35f;p=~andy%2Flinux [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 Signed-off-by: Greg Kroah-Hartman --- 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,