---

yaml --- r: 15495 b: refs/heads/master c: f3d34ed h: refs/heads/master i: 15493: 555e318 15491: 5bada98 15487: 30c37ef v: v3
git-mirror · Jan 4, 2006 · fbfb537 · fbfb537
1 parent 3cb44f1
commit fbfb537
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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,