diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /drivers/usb/input/acecad.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/input/acecad.c')
| -rw-r--r-- | drivers/usb/input/acecad.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c index 18c10e150ef3..d83603ba40ae 100644 --- a/drivers/usb/input/acecad.c +++ b/drivers/usb/input/acecad.c | |||
| @@ -141,10 +141,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_ | |||
| 141 | 141 | ||
| 142 | endpoint = &interface->endpoint[0].desc; | 142 | endpoint = &interface->endpoint[0].desc; |
| 143 | 143 | ||
| 144 | if (!(endpoint->bEndpointAddress & 0x80)) | 144 | if (!usb_endpoint_is_int_in(endpoint)) |
| 145 | return -ENODEV; | ||
| 146 | |||
| 147 | if ((endpoint->bmAttributes & 3) != 3) | ||
| 148 | return -ENODEV; | 145 | return -ENODEV; |
| 149 | 146 | ||
| 150 | pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress); | 147 | pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress); |