aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-cards.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index e776699b62f9..ef9bf008a924 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1842,7 +1842,7 @@ void em28xx_release_resources(struct em28xx *dev)
1842 * em28xx_init_dev() 1842 * em28xx_init_dev()
1843 * allocates and inits the device structs, registers i2c bus and v4l device 1843 * allocates and inits the device structs, registers i2c bus and v4l device
1844 */ 1844 */
1845int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, 1845static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
1846 int minor) 1846 int minor)
1847{ 1847{
1848 struct em28xx *dev = *devhandle; 1848 struct em28xx *dev = *devhandle;
@@ -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))