X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=drivers%2Fusb%2Fcore%2Fgeneric.c;h=271e761f563ee42e54f59eb175e23e06e4d19c5b;hb=5c6e9bf011bca072648017477b0fe36402be1415;hp=eff2010eb63f15d2fe513f3a42dae8e7ee5de7e6;hpb=a13eea6bd9ee62ceacfc5243d54c84396bc86cb4;p=deliverable%2Flinux.git

diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index eff2010eb63f..271e761f563e 100644
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -100,7 +100,7 @@ int usb_choose_configuration(struct usb_device *udev)
 		 */
 
 		/* Rule out configs that draw too much bus current */
-		if (c->desc.bMaxPower * 2 > udev->bus_mA) {
+		if (usb_get_max_power(udev, c) > udev->bus_mA) {
 			insufficient_power++;
 			continue;
 		}