diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /drivers/media/video/usbvision/usbvision-video.c | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-video.c')
| -rw-r--r-- | drivers/media/video/usbvision/usbvision-video.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index 2be5e47ed081..2622de003a45 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
| @@ -1674,8 +1674,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf, | |||
| 1674 | interface = &dev->actconfig->interface[ifnum]->altsetting[0]; | 1674 | interface = &dev->actconfig->interface[ifnum]->altsetting[0]; |
| 1675 | } | 1675 | } |
| 1676 | endpoint = &interface->endpoint[1].desc; | 1676 | endpoint = &interface->endpoint[1].desc; |
| 1677 | if (usb_endpoint_type(endpoint) != | 1677 | if (!usb_endpoint_xfer_isoc(endpoint)) { |
| 1678 | USB_ENDPOINT_XFER_ISOC) { | ||
| 1679 | err("%s: interface %d. has non-ISO endpoint!", | 1678 | err("%s: interface %d. has non-ISO endpoint!", |
| 1680 | __func__, ifnum); | 1679 | __func__, ifnum); |
| 1681 | err("%s: Endpoint attributes %d", | 1680 | err("%s: Endpoint attributes %d", |