From lcapitulino@mandriva.com.br Thu Oct 26 09:03:49 2006 Message-Id: <20061026160319.202698179@mandriva.com.br> Date: Thu, 26 Oct 2006 13:02:50 -0300 From: Luiz Fernando N. Capitulino To: greg@kroah.com Cc: linux-usb-devel@lists.sourceforge.net Subject: USB: ftdi-elan: Use usb_endpoint_* functions Content-Disposition: inline; filename=ftdi-use-usb-endpoint-functions.patch Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/ftdi-elan.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) --- gregkh-2.6.orig/drivers/usb/misc/ftdi-elan.c +++ gregkh-2.6/drivers/usb/misc/ftdi-elan.c @@ -2633,10 +2633,7 @@ static int ftdi_elan_probe(struct usb_in for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; if (!ftdi->bulk_in_endpointAddr && - ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) - == USB_DIR_IN) && ((endpoint->bmAttributes & - USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK)) - { + usb_endpoint_is_bulk_in(endpoint)) { buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); ftdi->bulk_in_size = buffer_size; ftdi->bulk_in_endpointAddr = endpoint->bEndpointAddress; @@ -2649,10 +2646,7 @@ static int ftdi_elan_probe(struct usb_in } } if (!ftdi->bulk_out_endpointAddr && - ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) - == USB_DIR_OUT) && ((endpoint->bmAttributes & - USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK)) - { + usb_endpoint_is_bulk_out(endpoint)) { ftdi->bulk_out_endpointAddr = endpoint->bEndpointAddress; }