[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>

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 99ab774d4fdbd8e7cbec5721d3be44aa1634c781..319de03944e7a39d9d0bac12a46afc4f8c32a023 100644 (file)
--- 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,