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/powermate.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/input/powermate.c')
| -rw-r--r-- | drivers/usb/input/powermate.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/input/powermate.c b/drivers/usb/input/powermate.c index b3c0d0c3eae9..f0f8db6810a2 100644 --- a/drivers/usb/input/powermate.c +++ b/drivers/usb/input/powermate.c | |||
| @@ -313,9 +313,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i | |||
| 313 | 313 | ||
| 314 | interface = intf->cur_altsetting; | 314 | interface = intf->cur_altsetting; |
| 315 | endpoint = &interface->endpoint[0].desc; | 315 | endpoint = &interface->endpoint[0].desc; |
| 316 | if (!(endpoint->bEndpointAddress & 0x80)) | 316 | if (!usb_endpoint_is_int_in(endpoint)) |
| 317 | return -EIO; | ||
| 318 | if ((endpoint->bmAttributes & 3) != 3) | ||
| 319 | return -EIO; | 317 | return -EIO; |
| 320 | 318 | ||
| 321 | usb_control_msg(udev, usb_sndctrlpipe(udev, 0), | 319 | usb_control_msg(udev, usb_sndctrlpipe(udev, 0), |