aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c3
-rw-r--r--drivers/media/video/usbvideo/ibmcam.c2
-rw-r--r--drivers/media/video/usbvideo/konicawc.c2
-rw-r--r--drivers/media/video/usbvideo/ultracam.c2
-rw-r--r--drivers/media/video/usbvision/usbvision-video.c3
5 files changed, 5 insertions, 7 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 6d2e4a6f8b2..ef9bf008a92 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1990,8 +1990,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
1990 int check_interface = 1; 1990 int check_interface = 1;
1991 isoc_pipe = 1; 1991 isoc_pipe = 1;
1992 endpoint = &interface->cur_altsetting->endpoint[1].desc; 1992 endpoint = &interface->cur_altsetting->endpoint[1].desc;
1993 if (usb_endpoint_type(endpoint) != 1993 if (!usb_endpoint_xfer_isoc(endpoint))
1994 USB_ENDPOINT_XFER_ISOC)
1995 check_interface = 0; 1994 check_interface = 0;
1996 1995
1997 if (usb_endpoint_dir_out(endpoint)) 1996 if (usb_endpoint_dir_out(endpoint))
diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c
index f8d85ddb480..b0854966178 100644
--- a/drivers/media/video/usbvideo/ibmcam.c
+++ b/drivers/media/video/usbvideo/ibmcam.c
@@ -3779,7 +3779,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
3779 err("Alternate settings have different endpoint addresses!"); 3779 err("Alternate settings have different endpoint addresses!");
3780 return -ENODEV; 3780 return -ENODEV;
3781 } 3781 }
3782 if (usb_endpoint_type(endpoint) != USB_ENDPOINT_XFER_ISOC) { 3782 if (!usb_endpoint_xfer_isoc(endpoint)) {
3783 err("Interface %d. has non-ISO endpoint!", ifnum); 3783 err("Interface %d. has non-ISO endpoint!", ifnum);
3784 return -ENODEV; 3784 return -ENODEV;
3785 } 3785 }
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c
index 90f0ce6a26b..900ec2129ca 100644
--- a/drivers/media/video/usbvideo/konicawc.c
+++ b/drivers/media/video/usbvideo/konicawc.c
@@ -823,7 +823,7 @@ static int konicawc_probe(struct usb_interface *intf, const struct usb_device_id
823 err("Alternate settings have different endpoint addresses!"); 823 err("Alternate settings have different endpoint addresses!");
824 return -ENODEV; 824 return -ENODEV;
825 } 825 }
826 if (usb_endpoint_type(endpoint) != USB_ENDPOINT_XFER_ISOC) { 826 if (!usb_endpoint_xfer_isoc(endpoint)) {
827 err("Interface %d. has non-ISO endpoint!", 827 err("Interface %d. has non-ISO endpoint!",
828 interface->desc.bInterfaceNumber); 828 interface->desc.bInterfaceNumber);
829 return -ENODEV; 829 return -ENODEV;
diff --git a/drivers/media/video/usbvideo/ultracam.c b/drivers/media/video/usbvideo/ultracam.c
index 839a08240c2..fbd1b639229 100644
--- a/drivers/media/video/usbvideo/ultracam.c
+++ b/drivers/media/video/usbvideo/ultracam.c
@@ -556,7 +556,7 @@ static int ultracam_probe(struct usb_interface *intf, const struct usb_device_id
556 err("Alternate settings have different endpoint addresses!"); 556 err("Alternate settings have different endpoint addresses!");
557 return -ENODEV; 557 return -ENODEV;
558 } 558 }
559 if (usb_endpoint_type(endpoint) != USB_ENDPOINT_XFER_ISOC) { 559 if (!usb_endpoint_xfer_isoc(endpoint)) {
560 err("Interface %d. has non-ISO endpoint!", 560 err("Interface %d. has non-ISO endpoint!",
561 interface->desc.bInterfaceNumber); 561 interface->desc.bInterfaceNumber);
562 return -ENODEV; 562 return -ENODEV;
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 2be5e47ed08..2622de003a4 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",