Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / usbvideo / ibmcam.c

diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c
index c710bcd1df48a7ba8f122c8ff3efce75af9b7488..f8d85ddb48048b6eb320d2cabdcdd5f929a5ea2c 100644 (file)
--- a/drivers/media/video/usbvideo/ibmcam.c
+++ b/drivers/media/video/usbvideo/ibmcam.c
@@ -3779,11 +3779,11 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                        err("Alternate settings have different endpoint addresses!");
                        return -ENODEV;
                }
-               if ((endpoint->bmAttributes & 0x03) != 0x01) {
+               if (usb_endpoint_type(endpoint) != USB_ENDPOINT_XFER_ISOC) {
                        err("Interface %d. has non-ISO endpoint!", ifnum);
                        return -ENODEV;
                }
-               if ((endpoint->bEndpointAddress & 0x80) == 0) {
+               if (usb_endpoint_dir_out(endpoint)) {
                        err("Interface %d. has ISO OUT endpoint!", ifnum);
                        return -ENODEV;
                }