aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/usbvision/usbvision-video.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-video.c')
-rw-r--r--drivers/media/video/usbvision/usbvision-video.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 48c8c4399eb8..85661b1848fe 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -1679,7 +1679,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
1679 interface = &dev->actconfig->interface[ifnum]->altsetting[0]; 1679 interface = &dev->actconfig->interface[ifnum]->altsetting[0];
1680 } 1680 }
1681 endpoint = &interface->endpoint[1].desc; 1681 endpoint = &interface->endpoint[1].desc;
1682 if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != 1682 if (usb_endpoint_type(endpoint) !=
1683 USB_ENDPOINT_XFER_ISOC) { 1683 USB_ENDPOINT_XFER_ISOC) {
1684 err("%s: interface %d. has non-ISO endpoint!", 1684 err("%s: interface %d. has non-ISO endpoint!",
1685 __func__, ifnum); 1685 __func__, ifnum);
@@ -1687,8 +1687,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
1687 __func__, endpoint->bmAttributes); 1687 __func__, endpoint->bmAttributes);
1688 return -ENODEV; 1688 return -ENODEV;
1689 } 1689 }
1690 if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == 1690 if (usb_endpoint_dir_out(endpoint)) {
1691 USB_DIR_OUT) {
1692 err("%s: interface %d. has ISO OUT endpoint!", 1691 err("%s: interface %d. has ISO OUT endpoint!",
1693 __func__, ifnum); 1692 __func__, ifnum);
1694 return -ENODEV; 1693 return -ENODEV;