From 0579d6a74d87e0b090374b5df916dbe25f91725f Mon Sep 17 00:00:00 2001 From: "Luiz Fernando N. Capitulino" Date: Wed, 27 Sep 2006 11:58:54 -0700 Subject: [PATCH] --- yaml --- r: 36412 b: refs/heads/master c: b0b660b8d5b446bf26a46b233adef5819d9a683c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/misc/usblcd.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 09f4f6cc62bd..8653e168264a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fa1bbf5cfac0e8c795e0ef7b2b939b45229ef2b +refs/heads/master: b0b660b8d5b446bf26a46b233adef5819d9a683c diff --git a/trunk/drivers/usb/misc/usblcd.c b/trunk/drivers/usb/misc/usblcd.c index 53e59e362330..dbaca9f1efad 100644 --- a/trunk/drivers/usb/misc/usblcd.c +++ b/trunk/drivers/usb/misc/usblcd.c @@ -290,9 +290,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id endpoint = &iface_desc->endpoint[i].desc; if (!dev->bulk_in_endpointAddr && - (endpoint->bEndpointAddress & USB_DIR_IN) && - ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) - == USB_ENDPOINT_XFER_BULK)) { + usb_endpoint_is_bulk_in(endpoint)) { /* we found a bulk in endpoint */ buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); dev->bulk_in_size = buffer_size; @@ -305,9 +303,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id } if (!dev->bulk_out_endpointAddr && - !(endpoint->bEndpointAddress & USB_DIR_IN) && - ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) - == USB_ENDPOINT_XFER_BULK)) { + usb_endpoint_is_bulk_out(endpoint)) { /* we found a bulk out endpoint */ dev->bulk_out_endpointAddr = endpoint->bEndpointAddress; }