aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/stk014.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-12-31 06:13:46 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:29 -0400
commit50e06dee958bdb81229cb42486f7fdc4917fa4da (patch)
tree9a5d02a24e5684c008137774a5ce0211a421c893 /drivers/media/video/gspca/stk014.c
parentafd46291393e20736368e275a6f5f7c44dfe9540 (diff)
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>
Diffstat (limited to 'drivers/media/video/gspca/stk014.c')
-rw-r--r--drivers/media/video/gspca/stk014.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index 60de9af87fb..cd1fbff0c94 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,
180 reg_w(gspca_dev, 0x63b, 0); 180 reg_w(gspca_dev, 0x63b, 0);
181 reg_w(gspca_dev, 0x630, 5); 181 reg_w(gspca_dev, 0x630, 5);
182 ret = usb_bulk_msg(dev, 182 ret = usb_bulk_msg(dev,
183 usb_rcvbulkpipe(dev, 5), 183 usb_rcvbulkpipe(dev, 0x05),
184 gspca_dev->usb_buf, 184 gspca_dev->usb_buf,
185 4, /* length */ 185 4, /* length */
186 &alen, 186 &alen,
@@ -294,9 +294,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
294 const struct usb_device_id *id) 294 const struct usb_device_id *id)
295{ 295{
296 struct sd *sd = (struct sd *) gspca_dev; 296 struct sd *sd = (struct sd *) gspca_dev;
297 struct cam *cam = &gspca_dev->cam;
298 297
299 cam->epaddr = 0x02;
300 gspca_dev->cam.cam_mode = vga_mode; 298 gspca_dev->cam.cam_mode = vga_mode;
301 gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode); 299 gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode);
302 sd->brightness = BRIGHTNESS_DEF; 300 sd->brightness = BRIGHTNESS_DEF;