26 files changed, 7 insertions, 43 deletions

diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c
index 1753f5bb3544..a7088f60bcd0 100644
--- a/drivers/media/video/gspca/conex.c
+++ b/drivers/media/video/gspca/conex.c
@@ -815,7 +815,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x01;
         cam->cam_mode = vga_mode;
         cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
 
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c
index f3cd8ff5cc92..ca888ac969d0 100644
--- a/drivers/media/video/gspca/etoms.c
+++ b/drivers/media/video/gspca/etoms.c
@@ -658,7 +658,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 1;
         sd->sensor = id->driver_info;
         if (sd->sensor == SENSOR_PAS106) {
                 cam->cam_mode = sif_mode;
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);
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 9b77ebbd875d..e13833b8ed67 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -439,22 +439,16 @@ static void destroy_urbs(struct gspca_dev *gspca_dev)
  * look for an input transfer endpoint in an alternate setting
  */
 static struct usb_host_endpoint *alt_xfer(struct usb_host_interface *alt,
-                                          __u8 epaddr,
                                           __u8 xfer)
 {
         struct usb_host_endpoint *ep;
         int i, attr;
 
-        epaddr |= USB_DIR_IN;
         for (i = 0; i < alt->desc.bNumEndpoints; i++) {
                 ep = &alt->endpoint[i];
-                if (ep->desc.bEndpointAddress == epaddr) {
-                        attr = ep->desc.bmAttributes
-                                                & USB_ENDPOINT_XFERTYPE_MASK;
-                        if (attr == xfer)
-                                return ep;
-                        break;
-                }
+                attr = ep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
+                if (attr == xfer)
+                        return ep;
         }
         return NULL;
 }
@@ -480,7 +474,6 @@ static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev)
         /* try isoc */
         while (--i > 0) {                       /* alt 0 is unusable */
                 ep = alt_xfer(&intf->altsetting[i],
-                                gspca_dev->cam.epaddr,
                                 USB_ENDPOINT_XFER_ISOC);
                 if (ep)
                         break;
@@ -489,7 +482,6 @@ static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev)
         /* if no isoc, try bulk */
         if (ep == NULL) {
                 ep = alt_xfer(&intf->altsetting[0],
-                                gspca_dev->cam.epaddr,
                                 USB_ENDPOINT_XFER_BULK);
                 if (ep == NULL) {
                         err("no transfer endpoint found");
@@ -618,8 +610,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
                 /* clear the bulk endpoint */
                 if (gspca_dev->alt == 0)        /* if bulk transfer */
                         usb_clear_halt(gspca_dev->dev,
-                                        usb_rcvintpipe(gspca_dev->dev,
-                                                 gspca_dev->cam.epaddr));
+                                        gspca_dev->urb[0]->pipe);
 
                 /* start the cam */
                 ret = gspca_dev->sd_desc->start(gspca_dev);
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index c90af9cb1e07..e5c8eb709036 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -62,7 +62,6 @@ struct cam {
                                  * - cannot be > MAX_NURBS
                                  * - when 0 and bulk_size != 0 means
                                  *   1 URB and submit done by subdriver */
-        __u8 epaddr;
 };
 
 struct gspca_dev;
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
index ed906fe31287..37a47db2903d 100644
--- a/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -332,7 +332,6 @@ static int m5602_configure(struct gspca_dev *gspca_dev,
         int err;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = M5602_ISOC_ENDPOINT_ADDR;
         sd->desc = &sd_desc;
 
         if (dump_bridge)
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index 3d2090e67a63..ba79afbf8b39 100644
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -121,7 +121,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x01;
         cam->cam_mode = vga_mode;
         cam->nmodes = ARRAY_SIZE(vga_mode);
         sd->qindex = 1;                 /* set the quantization table */
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index ee232956c812..ac9b4dc064d6 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -1360,7 +1360,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         }
 
         cam = &gspca_dev->cam;
-        cam->epaddr = OV511_ENDPOINT_ADDRESS;
         if (!sd->sif) {
                 cam->cam_mode = vga_mode;
                 cam->nmodes = ARRAY_SIZE(vga_mode);
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c
index 3bf15e401693..01314e9995f0 100644
--- a/drivers/media/video/gspca/ov534.c
+++ b/drivers/media/video/gspca/ov534.c
@@ -379,7 +379,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
 
         cam = &gspca_dev->cam;
 
-        cam->epaddr = 0x01;
         cam->cam_mode = vga_mode;
         cam->nmodes = ARRAY_SIZE(vga_mode);
 
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c
index c90ac852bac0..546820f52c02 100644
--- a/drivers/media/video/gspca/pac207.c
+++ b/drivers/media/video/gspca/pac207.c
@@ -256,7 +256,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
                 " (vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct);
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x05;
         cam->cam_mode = sif_mode;
         cam->nmodes = ARRAY_SIZE(sif_mode);
         sd->brightness = PAC207_BRIGHTNESS_DEFAULT;
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index a9c95cba710e..f34bbc5db501 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -498,7 +498,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x05;
 
         sd->sensor = id->driver_info;
         if (sd->sensor == SENSOR_PAC7302) {
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index b3e4e0677b68..5ec361c779be 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -870,7 +870,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         gspca_dev->ctrl_dis = sensor_data[sd->sensor].ctrl_dis;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x01;
         if (!(sensor_data[sd->sensor].flags & F_SIF)) {
                 cam->cam_mode = vga_mode;
                 cam->nmodes = ARRAY_SIZE(vga_mode);
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 3373b8d9d2a8..5c159d89bd82 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -1018,7 +1018,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x01;
         cam->cam_mode = vga_mode;
         cam->nmodes = ARRAY_SIZE(vga_mode);
 
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index 942f04cd44dd..94ed469a3ada 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -629,7 +629,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x01;
         sd->subtype = id->driver_info;
         if (sd->subtype != LogitechClickSmart310) {
                 cam->cam_mode = vga_mode;
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index 82e3e3e2ada1..766da90e6eb7 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -1934,7 +1934,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x01;
         cam->cam_mode = vga_mode;
         cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
         sd->subtype = id->driver_info;
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c
index 2a33a29010ee..90d555361ae7 100644
--- a/drivers/media/video/gspca/spca505.c
+++ b/drivers/media/video/gspca/spca505.c
@@ -636,7 +636,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x01;
         cam->cam_mode = vga_mode;
         sd->subtype = id->driver_info;
         if (sd->subtype != IntelPCCameraPro)
diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c
index 96e2512e0621..99fa3fc1cb62 100644
--- a/drivers/media/video/gspca/spca506.c
+++ b/drivers/media/video/gspca/spca506.c
@@ -303,7 +303,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x01;
         cam->cam_mode = vga_mode;
         cam->nmodes = sizeof vga_mode / sizeof vga_mode[0];
         sd->brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index be5d740a315d..f5c045967379 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -1487,7 +1487,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         PDEBUG(D_PROBE, "Window 1 average luminance: %d", data1);
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x01;
         cam->cam_mode = sif_mode;
         cam->nmodes = ARRAY_SIZE(sif_mode);
 
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index 3c9288019e96..d64e7d64d053 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -541,7 +541,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         }
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x01;
         gspca_dev->nbalt = 7 + 1;       /* choose alternate 7 first */
 
         sd->chip_revision = id->driver_info;
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index 60de9af87fbb..cd1fbff0c94c 100644
--- a/drivers/media/video/gspca/stk014.c
+++ b/drivers/media/video/gspca/stk014.c
@@ -180,7 +180,7 @@ static int rcv_val(struct gspca_dev *gspca_dev,
         reg_w(gspca_dev, 0x63b, 0);
         reg_w(gspca_dev, 0x630, 5);
         ret = usb_bulk_msg(dev,
-                        usb_rcvbulkpipe(dev, 5),
+                        usb_rcvbulkpipe(dev, 0x05),
                         gspca_dev->usb_buf,
                         4,              /* length */
                         &alen,
@@ -294,9 +294,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
                         const struct usb_device_id *id)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        struct cam *cam = &gspca_dev->cam;
 
-        cam->epaddr = 0x02;
         gspca_dev->cam.cam_mode = vga_mode;
         gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode);
         sd->brightness = BRIGHTNESS_DEF;
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/video/gspca/stv06xx/stv06xx.c
index 13a021e3cbb7..c60b163335c5 100644
--- a/drivers/media/video/gspca/stv06xx/stv06xx.c
+++ b/drivers/media/video/gspca/stv06xx/stv06xx.c
@@ -429,7 +429,6 @@ static int stv06xx_config(struct gspca_dev *gspca_dev,
         PDEBUG(D_PROBE, "Configuring camera");
 
         cam = &gspca_dev->cam;
-        cam->epaddr = STV_ISOC_ENDPOINT_ADDR;
         sd->desc = sd_desc;
         gspca_dev->sd_desc = &sd->desc;
 
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index 6d904d5e4c74..1f07476a9905 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -812,7 +812,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x01;
 
         sd->bridge = id->driver_info >> 8;
         sd->subtype = id->driver_info;
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index 6ee111a3cbd1..74ca17845223 100644
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -538,7 +538,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         struct cam *cam;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x01;
 
         cam->cam_mode = vga_mode_t16;
         cam->nmodes = ARRAY_SIZE(vga_mode_t16);
diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c
index 94163cceb28a..1da292ea1c77 100644
--- a/drivers/media/video/gspca/tv8532.c
+++ b/drivers/media/video/gspca/tv8532.c
@@ -241,7 +241,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         tv_8532WriteEEprom(gspca_dev);
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 1;
         cam->cam_mode = sif_mode;
         cam->nmodes = sizeof sif_mode / sizeof sif_mode[0];
 
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index 0525ea51a6de..ab5a25cfc69e 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -1979,7 +1979,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         int sensor;
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x02;
         sd->bridge = id->driver_info;
 
         vc0321_reset(gspca_dev);
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index ec2a53d53fe2..c32477db3bab 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -7147,7 +7147,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
         }
 
         cam = &gspca_dev->cam;
-        cam->epaddr = 0x01;
 /*fixme:test*/
         gspca_dev->nbalt--;
         if (vga) {