summaryrefslogtreecommitdiff
path: root/drivers/media/video/gspca/se401.c
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2011-11-30 05:54:16 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-12-11 09:26:11 -0200
commit6121ca572f1b38dbce79b0366b47dbf2ce305eec (patch)
tree947dc5b9e4b33668300d920ce9aaea2fb9f74eb8 /drivers/media/video/gspca/se401.c
parenta67648797a9cc5a407b7b81825b48ca5920c0c91 (diff)
[media] gspca: Remove the useless variable 'nbalt'
As the alternate settings are now sorted in gspca main, the variable 'nbalt' is no more useful. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/se401.c')
-rw-r--r--drivers/media/video/gspca/se401.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/se401.c b/drivers/media/video/gspca/se401.c
index 3b71bbcd977a..6d9835342e0a 100644
--- a/drivers/media/video/gspca/se401.c
+++ b/drivers/media/video/gspca/se401.c
@@ -376,7 +376,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
cam->bulk_size = BULK_SIZE;
cam->bulk_nurbs = 4;
cam->ctrls = sd->ctrls;
- gspca_dev->nbalt = 1; /* Ignore the bogus isoc alt settings */
sd->resetlevel = 0x2d; /* Set initial resetlevel */
/* See if the camera supports brightness */
@@ -395,6 +394,14 @@ static int sd_init(struct gspca_dev *gspca_dev)
return 0;
}
+/* function called at start time before URB creation */
+static int sd_isoc_init(struct gspca_dev *gspca_dev)
+{
+ gspca_dev->alt = 1; /* Ignore the bogus isoc alt settings */
+
+ return gspca_dev->usb_err;
+}
+
/* -- start the camera -- */
static int sd_start(struct gspca_dev *gspca_dev)
{
@@ -714,6 +721,7 @@ static const struct sd_desc sd_desc = {
.nctrls = ARRAY_SIZE(sd_ctrls),
.config = sd_config,
.init = sd_init,
+ .isoc_init = sd_isoc_init,
.start = sd_start,
.stopN = sd_stopN,
.dq_callback = sd_dq_callback,