diff options
Diffstat (limited to 'drivers/media/video/usbvideo/quickcam_messenger.c')
-rw-r--r-- | drivers/media/video/usbvideo/quickcam_messenger.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c index 606402a54eba..fd112f0b9d35 100644 --- a/drivers/media/video/usbvideo/quickcam_messenger.c +++ b/drivers/media/video/usbvideo/quickcam_messenger.c | |||
@@ -955,8 +955,7 @@ static int qcm_probe(struct usb_interface *intf, | |||
955 | for (j=0; j < interface->desc.bNumEndpoints; j++) { | 955 | for (j=0; j < interface->desc.bNumEndpoints; j++) { |
956 | endpoint = &interface->endpoint[j].desc; | 956 | endpoint = &interface->endpoint[j].desc; |
957 | 957 | ||
958 | if ((endpoint->bEndpointAddress & | 958 | if (usb_endpoint_dir_out(endpoint)) |
959 | USB_ENDPOINT_DIR_MASK) != USB_DIR_IN) | ||
960 | continue; /* not input then not good */ | 959 | continue; /* not input then not good */ |
961 | 960 | ||
962 | buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); | 961 | buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); |
@@ -965,9 +964,7 @@ static int qcm_probe(struct usb_interface *intf, | |||
965 | continue; /* 0 pkt size is not what we want */ | 964 | continue; /* 0 pkt size is not what we want */ |
966 | } | 965 | } |
967 | 966 | ||
968 | if ((endpoint->bmAttributes & | 967 | if (usb_endpoint_xfer_isoc(endpoint)) { |
969 | USB_ENDPOINT_XFERTYPE_MASK) == | ||
970 | USB_ENDPOINT_XFER_ISOC) { | ||
971 | video_ep = endpoint->bEndpointAddress; | 968 | video_ep = endpoint->bEndpointAddress; |
972 | /* break out of the search */ | 969 | /* break out of the search */ |
973 | goto good_videoep; | 970 | goto good_videoep; |