From 94234e1251b02e0266a57bdfe100b2a392459d99 Mon Sep 17 00:00:00 2001 From: "Luiz Fernando N. Capitulino" Date: Thu, 26 Oct 2006 13:03:03 -0300 Subject: [PATCH] --- yaml --- r: 41261 b: refs/heads/master c: 0472074748444529188c77f62f0714f9ff7d7556 h: refs/heads/master i: 41259: eb017bb469e5e576d461e8ec210fb219bebadf7d v: v3 --- [refs] | 2 +- trunk/drivers/usb/storage/usb.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 55227acadbe6..0a8fea088dee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d823dd21d81c29a83a4672ac92e449fc5fa5cca +refs/heads/master: 0472074748444529188c77f62f0714f9ff7d7556 diff --git a/trunk/drivers/usb/storage/usb.c b/trunk/drivers/usb/storage/usb.c index b8d6031b0975..b401084b3d22 100644 --- a/trunk/drivers/usb/storage/usb.c +++ b/trunk/drivers/usb/storage/usb.c @@ -740,18 +740,16 @@ static int get_pipes(struct us_data *us) ep = &altsetting->endpoint[i].desc; /* Is it a BULK endpoint? */ - if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) - == USB_ENDPOINT_XFER_BULK) { + if (usb_endpoint_xfer_bulk(ep)) { /* BULK in or out? */ - if (ep->bEndpointAddress & USB_DIR_IN) + if (usb_endpoint_dir_in(ep)) ep_in = ep; else ep_out = ep; } /* Is it an interrupt endpoint? */ - else if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) - == USB_ENDPOINT_XFER_INT) { + else if (usb_endpoint_xfer_int(ep)) { ep_int = ep; } }