From bdf383f37f33fbde72300b4b886d8f00546824d2 Mon Sep 17 00:00:00 2001
From: "Luiz Fernando N. Capitulino" <lcapitulino@mandriva.com.br>
Date: Thu, 26 Oct 2006 13:02:49 -0300
Subject: [PATCH] --- yaml --- r: 41247 b: refs/heads/master c:
 87ad46c94ec74f1750764c12744410ed524f9900 h: refs/heads/master i:   41245:
 91537cb0a1626a0f0979ccfaaa81415e3bcbcd49   41243:
 29783c874b7df46f70916feb402f1db295a8b76c   41239:
 466d8d3156a1c7de3506b64801eb57fe5d57b7b8   41231:
 40c3393c43f0bba71d1386eb08a5ef3efa6598b4   41215:
 a7d6345be37d5de5deb4e758515d4f7b7975d42c v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/core/devices.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 780cc3357d8c..c23e333c18bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45aea704d12d05f06b3f82974aa1438460f42398
+refs/heads/master: 87ad46c94ec74f1750764c12744410ed524f9900
diff --git a/trunk/drivers/usb/core/devices.c b/trunk/drivers/usb/core/devices.c
index 3538c2fdadfe..ea398e5d50af 100644
--- a/trunk/drivers/usb/core/devices.c
+++ b/trunk/drivers/usb/core/devices.c
@@ -175,12 +175,13 @@ static char *usb_dump_endpoint_descriptor (
 )
 {
 	char dir, unit, *type;
-	unsigned interval, in, bandwidth = 1;
+	unsigned interval, bandwidth = 1;
 
 	if (start > end)
 		return start;
-	in = (desc->bEndpointAddress & USB_DIR_IN);
-	dir = in ? 'I' : 'O';
+
+	dir = usb_endpoint_dir_in(desc) ? 'I' : 'O';
+
 	if (speed == USB_SPEED_HIGH) {
 		switch (le16_to_cpu(desc->wMaxPacketSize) & (0x03 << 11)) {
 		case 1 << 11:	bandwidth = 2; break;
@@ -204,7 +205,7 @@ static char *usb_dump_endpoint_descriptor (
 		break;
 	case USB_ENDPOINT_XFER_BULK:
 		type = "Bulk";
-		if (speed == USB_SPEED_HIGH && !in)	/* uframes per NAK */
+		if (speed == USB_SPEED_HIGH && dir == 'O') /* uframes per NAK */
 			interval = desc->bInterval;
 		else
 			interval = 0;