diff options
author | Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br> | 2006-09-27 14:58:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-27 14:58:54 -0400 |
commit | b0b660b8d5b446bf26a46b233adef5819d9a683c (patch) | |
tree | e529be7d3c88f8c2d727067ff4d9f91f6a4d0eb5 /drivers/usb/misc | |
parent | 4fa1bbf5cfac0e8c795e0ef7b2b939b45229ef2b (diff) |
USB: usblcd: Use usb_endpoint_* functions.
Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r-- | drivers/usb/misc/usblcd.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c index 53e59e362330..dbaca9f1efad 100644 --- a/drivers/usb/misc/usblcd.c +++ b/drivers/usb/misc/usblcd.c | |||
@@ -290,9 +290,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id | |||
290 | endpoint = &iface_desc->endpoint[i].desc; | 290 | endpoint = &iface_desc->endpoint[i].desc; |
291 | 291 | ||
292 | if (!dev->bulk_in_endpointAddr && | 292 | if (!dev->bulk_in_endpointAddr && |
293 | (endpoint->bEndpointAddress & USB_DIR_IN) && | 293 | usb_endpoint_is_bulk_in(endpoint)) { |
294 | ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) | ||
295 | == USB_ENDPOINT_XFER_BULK)) { | ||
296 | /* we found a bulk in endpoint */ | 294 | /* we found a bulk in endpoint */ |
297 | buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); | 295 | buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); |
298 | dev->bulk_in_size = buffer_size; | 296 | dev->bulk_in_size = buffer_size; |
@@ -305,9 +303,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id | |||
305 | } | 303 | } |
306 | 304 | ||
307 | if (!dev->bulk_out_endpointAddr && | 305 | if (!dev->bulk_out_endpointAddr && |
308 | !(endpoint->bEndpointAddress & USB_DIR_IN) && | 306 | usb_endpoint_is_bulk_out(endpoint)) { |
309 | ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) | ||
310 | == USB_ENDPOINT_XFER_BULK)) { | ||
311 | /* we found a bulk out endpoint */ | 307 | /* we found a bulk out endpoint */ |
312 | dev->bulk_out_endpointAddr = endpoint->bEndpointAddress; | 308 | dev->bulk_out_endpointAddr = endpoint->bEndpointAddress; |
313 | } | 309 | } |