diff options
author | Jean-François Moine <moinejf@free.fr> | 2011-03-13 15:17:08 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 03:54:48 -0400 |
commit | 7d47b789ceb456d90a3ace522dbcb2a94d2693ca (patch) | |
tree | 893b1ba1b741d34ec4bf78699a45fe9f2ed1b848 /drivers/media/video/gspca | |
parent | 75b79ffcc37c6bd05fa895f85d2d6426a9e4c3f1 (diff) |
[media] gspca - jeilinj / stv06xx: Fix some warnings
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')
-rw-r--r-- | drivers/media/video/gspca/jeilinj.c | 2 | ||||
-rw-r--r-- | drivers/media/video/gspca/stv06xx/stv06xx.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/jeilinj.c b/drivers/media/video/gspca/jeilinj.c index 06b777f5379e..36dae38b1e38 100644 --- a/drivers/media/video/gspca/jeilinj.c +++ b/drivers/media/video/gspca/jeilinj.c | |||
@@ -183,7 +183,6 @@ static void jlj_dostream(struct work_struct *work) | |||
183 | struct sd *dev = container_of(work, struct sd, work_struct); | 183 | struct sd *dev = container_of(work, struct sd, work_struct); |
184 | struct gspca_dev *gspca_dev = &dev->gspca_dev; | 184 | struct gspca_dev *gspca_dev = &dev->gspca_dev; |
185 | int blocks_left; /* 0x200-sized blocks remaining in current frame. */ | 185 | int blocks_left; /* 0x200-sized blocks remaining in current frame. */ |
186 | int size_in_blocks; | ||
187 | int act_len; | 186 | int act_len; |
188 | int packet_type; | 187 | int packet_type; |
189 | int ret; | 188 | int ret; |
@@ -209,7 +208,6 @@ static void jlj_dostream(struct work_struct *work) | |||
209 | act_len, JEILINJ_MAX_TRANSFER); | 208 | act_len, JEILINJ_MAX_TRANSFER); |
210 | if (ret < 0 || act_len < FRAME_HEADER_LEN) | 209 | if (ret < 0 || act_len < FRAME_HEADER_LEN) |
211 | goto quit_stream; | 210 | goto quit_stream; |
212 | size_in_blocks = buffer[0x0a]; | ||
213 | blocks_left = buffer[0x0a] - 1; | 211 | blocks_left = buffer[0x0a] - 1; |
214 | PDEBUG(D_STREAM, "blocks_left = 0x%x", blocks_left); | 212 | PDEBUG(D_STREAM, "blocks_left = 0x%x", blocks_left); |
215 | 213 | ||
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/video/gspca/stv06xx/stv06xx.c index 7e0661429293..abf1658fa33e 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx.c +++ b/drivers/media/video/gspca/stv06xx/stv06xx.c | |||
@@ -525,11 +525,9 @@ static int stv06xx_config(struct gspca_dev *gspca_dev, | |||
525 | const struct usb_device_id *id) | 525 | const struct usb_device_id *id) |
526 | { | 526 | { |
527 | struct sd *sd = (struct sd *) gspca_dev; | 527 | struct sd *sd = (struct sd *) gspca_dev; |
528 | struct cam *cam; | ||
529 | 528 | ||
530 | PDEBUG(D_PROBE, "Configuring camera"); | 529 | PDEBUG(D_PROBE, "Configuring camera"); |
531 | 530 | ||
532 | cam = &gspca_dev->cam; | ||
533 | sd->desc = sd_desc; | 531 | sd->desc = sd_desc; |
534 | sd->bridge = id->driver_info; | 532 | sd->bridge = id->driver_info; |
535 | gspca_dev->sd_desc = &sd->desc; | 533 | gspca_dev->sd_desc = &sd->desc; |