From lcapitulino@mandriva.com.br Thu Oct 26 09:04:33 2006 Message-Id: <20061026160326.381403501@mandriva.com.br> Date: Thu, 26 Oct 2006 13:03:03 -0300 From: Luiz Fernando N. Capitulino To: greg@kroah.com Cc: linux-usb-devel@lists.sourceforge.net Subject: USB: storage: Use usb_endpoint_* functions Content-Disposition: inline; filename=usb-use-usb-endpoint-functions.patch Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman --- drivers/usb/storage/usb.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) --- gregkh-2.6.orig/drivers/usb/storage/usb.c +++ gregkh-2.6/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; } }