From f21f2234ab9a93ddabd668daa6ef3aa3a305c577 Mon Sep 17 00:00:00 2001 From: "Luiz Fernando N. Capitulino" Date: Wed, 27 Sep 2006 11:58:53 -0700 Subject: [PATCH] --- yaml --- r: 36405 b: refs/heads/master c: fbf81c29a3c05cd227cad89435d71c15e958feaf h: refs/heads/master i: 36403: d8278d6c8899483b1b278354c66c03211a9d47ab v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/hub.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d5dba85a06ee..42d28160502c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bc66d530b6c158795cb3fefd2106a09afb5e0f7 +refs/heads/master: fbf81c29a3c05cd227cad89435d71c15e958feaf diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c index 64e80b964b87..3924dd080bea 100644 --- a/trunk/drivers/usb/core/hub.c +++ b/trunk/drivers/usb/core/hub.c @@ -868,13 +868,8 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) endpoint = &desc->endpoint[0].desc; - /* Output endpoint? Curiouser and curiouser.. */ - if (!(endpoint->bEndpointAddress & USB_DIR_IN)) - goto descriptor_error; - - /* If it's not an interrupt endpoint, we'd better punt! */ - if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) - != USB_ENDPOINT_XFER_INT) + /* If it's not an interrupt in endpoint, we'd better punt! */ + if (!usb_endpoint_is_int_in(endpoint)) goto descriptor_error; /* We found a hub */