V4L/DVB (10333): gspca - main and many subdrivers: Remove the epaddr variable.

The transfer endpoint address is now automatically chosen.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c
index afc8b2dd307b..76c6e03cb6c9 100644
--- a/drivers/media/video/gspca/finepix.c
+++ b/drivers/media/video/gspca/finepix.c
@@ -259,7 +259,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
 
         cam->cam_mode = fpix_mode;
         cam->nmodes = 1;
-        cam->epaddr = 0x01;     /* todo: correct for all cams? */
         cam->bulk_size = FPIX_MAX_TRANSFER;
 
 /*      gspca_dev->nbalt = 1;    * use bulk transfer */
@@ -335,8 +334,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
         /* Read the result of the command. Ignore the result, for it
          * varies with the device. */
         ret = usb_bulk_msg(gspca_dev->dev,
-                        usb_rcvbulkpipe(gspca_dev->dev,
-                                        gspca_dev->cam.epaddr),
+                        gspca_dev->urb[0]->pipe,
                         gspca_dev->usb_buf, FPIX_MAX_TRANSFER, &size_ret,
                         FPIX_TIMEOUT);
         if (ret != 0) {
@@ -363,7 +361,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
         }
 
         /* Again, reset bulk in endpoint */
-        usb_clear_halt(gspca_dev->dev, gspca_dev->cam.epaddr);
+        usb_clear_halt(gspca_dev->dev, gspca_dev->urb[0]->pipe);
 
         /* Allocate a control URB */
         dev->control_urb = usb_alloc_urb(0, GFP_KERNEL);