diff options
| author | Conger, Chris A <CHRIS.A.CONGER@saic.com> | 2005-07-29 15:18:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 16:12:54 -0400 |
| commit | 6b216df87cb5f3bb7d47a33f1cd955ebc7b84dfd (patch) | |
| tree | 47be6973ba2f07151b742f49f1c859ed8a6bd901 | |
| parent | 3eb0c5f4b539873ca88f8597db6a49e83ddfd7e2 (diff) | |
[PATCH] USB: fix Bug in usb-skeleton.c
Compare endpoint address to USB_ENDPOINT_DIR_MASK to determine endpoint
direction...
From: "Conger, Chris A." <CHRIS.A.CONGER@saic.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/usb/usb-skeleton.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c index 6051a646fe69..353f24d45bc1 100644 --- a/drivers/usb/usb-skeleton.c +++ b/drivers/usb/usb-skeleton.c | |||
| @@ -257,7 +257,8 @@ static int skel_probe(struct usb_interface *interface, const struct usb_device_i | |||
| 257 | endpoint = &iface_desc->endpoint[i].desc; | 257 | endpoint = &iface_desc->endpoint[i].desc; |
| 258 | 258 | ||
| 259 | if (!dev->bulk_in_endpointAddr && | 259 | if (!dev->bulk_in_endpointAddr && |
| 260 | (endpoint->bEndpointAddress & USB_DIR_IN) && | 260 | ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) |
| 261 | == USB_DIR_IN) && | ||
| 261 | ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) | 262 | ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) |
| 262 | == USB_ENDPOINT_XFER_BULK)) { | 263 | == USB_ENDPOINT_XFER_BULK)) { |
| 263 | /* we found a bulk in endpoint */ | 264 | /* we found a bulk in endpoint */ |
| @@ -272,7 +273,8 @@ static int skel_probe(struct usb_interface *interface, const struct usb_device_i | |||
| 272 | } | 273 | } |
| 273 | 274 | ||
| 274 | if (!dev->bulk_out_endpointAddr && | 275 | if (!dev->bulk_out_endpointAddr && |
| 275 | !(endpoint->bEndpointAddress & USB_DIR_OUT) && | 276 | ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) |
| 277 | == USB_DIR_OUT) && | ||
| 276 | ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) | 278 | ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) |
| 277 | == USB_ENDPOINT_XFER_BULK)) { | 279 | == USB_ENDPOINT_XFER_BULK)) { |
| 278 | /* we found a bulk out endpoint */ | 280 | /* we found a bulk out endpoint */ |
