From fbfb537662ee1662a32e0a49a2f6eea8cb0eced4 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Tue, 13 Dec 2005 10:32:13 -0500 Subject: [PATCH] --- yaml --- r: 15495 b: refs/heads/master c: f3d34ed48c80903544b509031fee64838d29f35f h: refs/heads/master i: 15493: 555e3189f4002ebe4a58d30d479ea711881ec874 15491: 5bada980be1c49a666d453238e11d00454322bd0 15487: 30c37efe9a49266212301b8e8d6b0c4ec6a228bf v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/message.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ecaa52d52093..5aa912b4a4ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3717f2952bd0aab30fe2a6af80657abbeb065461 +refs/heads/master: f3d34ed48c80903544b509031fee64838d29f35f diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c index 99ab774d4fdb..319de03944e7 100644 --- a/trunk/drivers/usb/core/message.c +++ b/trunk/drivers/usb/core/message.c @@ -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,