lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: devices: Use usb_endpoint_* functions

Browse Source 
Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Luiz Fernando N. Capitulino
2006-10-26 13:02:49 -03:00
committed by Greg Kroah-Hartman
parent 45aea704d1
commit 87ad46c94e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/usb/core/devices.c
View File

@@ -175,12 +175,13 @@ static char *usb_dump_endpoint_descriptor (
) )
{ {
char dir, unit, *type; char dir, unit, *type;
unsigned interval, in, bandwidth = 1; unsigned interval, bandwidth = 1;
if (start > end) if (start > end)
return start; 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) { if (speed == USB_SPEED_HIGH) {
switch (le16_to_cpu(desc->wMaxPacketSize) & (0x03 << 11)) { switch (le16_to_cpu(desc->wMaxPacketSize) & (0x03 << 11)) {
case 1 << 11: bandwidth = 2; break; case 1 << 11: bandwidth = 2; break;
@@ -204,7 +205,7 @@ static char *usb_dump_endpoint_descriptor (
break; break;
case USB_ENDPOINT_XFER_BULK: case USB_ENDPOINT_XFER_BULK:
type = "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; interval = desc->bInterval;
else else
interval = 0; interval = 0;