From: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Date: Thu, 26 Oct 2006 16:02:55 +0000 (-0300)
Subject: USB: onetouch: Use usb_endpoint_* functions
X-Git-Tag: v2.6.20-rc2~6^2~13^2~477^2~84
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=66722a194ef96a09ac12d0fe2f9e206f86c29c9f;p=~emulex%2Finfiniband.git

USB: onetouch: Use usb_endpoint_* functions

Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c
index 3baf448e300..3a158d58441 100644
--- a/drivers/usb/storage/onetouch.c
+++ b/drivers/usb/storage/onetouch.c
@@ -142,10 +142,7 @@ int onetouch_connect_input(struct us_data *ss)
 		return -ENODEV;
 
 	endpoint = &interface->endpoint[2].desc;
-	if (!(endpoint->bEndpointAddress & USB_DIR_IN))
-		return -ENODEV;
-	if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
-			!= USB_ENDPOINT_XFER_INT)
+	if (!usb_endpoint_is_int_in(endpoint))
 		return -ENODEV;
 
 	pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);