From lcapitulino@mandriva.com.br Thu Oct 26 09:04:11 2006 Message-Id: <20061026160321.398602246@mandriva.com.br> Date: Thu, 26 Oct 2006 13:02:54 -0300 From: Luiz Fernando N. Capitulino To: greg@kroah.com Cc: linux-usb-devel@lists.sourceforge.net Subject: USB: legousbtower: Use usb_endpoint_* functions Content-Disposition: inline; filename=legousbtower-use-usb-endpoint-functions.patch Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/legousbtower.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) --- gregkh-2.6.orig/drivers/usb/misc/legousbtower.c +++ gregkh-2.6/drivers/usb/misc/legousbtower.c @@ -898,14 +898,11 @@ static int tower_probe (struct usb_inter for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; - if (((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) && - ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)) { - dev->interrupt_in_endpoint = endpoint; - } - - if (((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) && - ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)) { - dev->interrupt_out_endpoint = endpoint; + if (usb_endpoint_xfer_int(endpoint)) { + if (usb_endpoint_dir_in(endpoint)) + dev->interrupt_in_endpoint = endpoint; + else + dev->interrupt_out_endpoint = endpoint; } } if(dev->interrupt_in_endpoint == NULL) {