From 744a2e4d4498bc2ee4812f46cd7cd8e874ede945 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Wed, 9 Feb 2011 01:12:40 +0200 Subject: [PATCH] --- yaml --- r: 235873 b: refs/heads/master c: ee99aa4928129d4aad9087988db6b7815ecdc1d5 h: refs/heads/master i: 235871: edcd418b475f7759aa2aaa628df7b4c6a66040ae v: v3 --- [refs] | 2 +- trunk/drivers/staging/easycap/easycap_main.c | 29 ++------------------ 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/[refs] b/[refs] index 6b6a27bc2b60..f70eedd3ef9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66681fb74e3d2f4dbf40f1e22b315a3807408eaf +refs/heads/master: ee99aa4928129d4aad9087988db6b7815ecdc1d5 diff --git a/trunk/drivers/staging/easycap/easycap_main.c b/trunk/drivers/staging/easycap/easycap_main.c index 396f56b1e419..cfdbb575322d 100644 --- a/trunk/drivers/staging/easycap/easycap_main.c +++ b/trunk/drivers/staging/easycap/easycap_main.c @@ -3145,7 +3145,7 @@ static const struct v4l2_file_operations v4l2_fops = { static int easycap_usb_probe(struct usb_interface *pusb_interface, const struct usb_device_id *pusb_device_id) { - struct usb_device *pusb_device, *pusb_device1; + struct usb_device *pusb_device; struct usb_host_interface *pusb_host_interface; struct usb_endpoint_descriptor *pepd; struct usb_interface_descriptor *pusb_interface_descriptor; @@ -3182,32 +3182,13 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface, #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ -/* setup modules params */ - - if (NULL == pusb_interface) { - SAY("ERROR: pusb_interface is NULL\n"); - return -EFAULT; - } /*---------------------------------------------------------------------------*/ /* * GET POINTER TO STRUCTURE usb_device */ /*---------------------------------------------------------------------------*/ - pusb_device1 = container_of(pusb_interface->dev.parent, - struct usb_device, dev); - if (NULL == pusb_device1) { - SAY("ERROR: pusb_device1 is NULL\n"); - return -EFAULT; - } - pusb_device = usb_get_dev(pusb_device1); - if (NULL == pusb_device) { - SAY("ERROR: pusb_device is NULL\n"); - return -EFAULT; - } - if ((unsigned long int)pusb_device1 != (unsigned long int)pusb_device) { - JOT(4, "ERROR: pusb_device1 != pusb_device\n"); - return -EFAULT; - } + pusb_device = interface_to_usbdev(pusb_interface); + JOT(4, "bNumConfigurations=%i\n", pusb_device->descriptor.bNumConfigurations); /*---------------------------------------------------------------------------*/ pusb_host_interface = pusb_interface->cur_altsetting; @@ -4568,10 +4549,6 @@ static void easycap_usb_disconnect(struct usb_interface *pusb_interface) JOT(4, "\n"); - if (NULL == pusb_interface) { - JOT(4, "ERROR: pusb_interface is NULL\n"); - return; - } pusb_host_interface = pusb_interface->cur_altsetting; if (NULL == pusb_host_interface) { JOT(4, "ERROR: pusb_host_interface is NULL\n");