korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-10 12:34:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[media] gspca - jeilinj: use gspca_dev->usb_err to forward error to upper layer

Browse Source 
Signed-off-by: Patrice CHOTARD <patricechotard@free.fr>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Patrice Chotard 2011-04-18 17:38:37 -03:00 committed by Mauro Carvalho Chehab
parent c3d8692758
commit 8715b16ead
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/media/video/gspca/jeilinj.c
View File

@ -71,39 +71,44 @@ static struct v4l2_pix_format jlj_mode[] = {
*/ */
/* All commands are two bytes only */ /* All commands are two bytes only */
static int jlj_write2(struct gspca_dev *gspca_dev, unsigned char *command) static void jlj_write2(struct gspca_dev *gspca_dev, unsigned char *command)
{ {
int retval; int retval;
if (gspca_dev->usb_err < 0)
return;
memcpy(gspca_dev->usb_buf, command, 2); memcpy(gspca_dev->usb_buf, command, 2);
retval = usb_bulk_msg(gspca_dev->dev, retval = usb_bulk_msg(gspca_dev->dev,
usb_sndbulkpipe(gspca_dev->dev, 3), usb_sndbulkpipe(gspca_dev->dev, 3),
gspca_dev->usb_buf, 2, NULL, 500); gspca_dev->usb_buf, 2, NULL, 500);
if (retval < 0) if (retval < 0) {
err("command write [%02x] error %d", err("command write [%02x] error %d",
gspca_dev->usb_buf[0], retval); gspca_dev->usb_buf[0], retval);
return retval; gspca_dev->usb_err = retval;
}
} }
/* Responses are one byte only */ /* Responses are one byte only */
static int jlj_read1(struct gspca_dev *gspca_dev, unsigned char response) static void jlj_read1(struct gspca_dev *gspca_dev, unsigned char response)
{ {
int retval; int retval;
if (gspca_dev->usb_err < 0)
return;
retval = usb_bulk_msg(gspca_dev->dev, retval = usb_bulk_msg(gspca_dev->dev,
usb_rcvbulkpipe(gspca_dev->dev, 0x84), usb_rcvbulkpipe(gspca_dev->dev, 0x84),
gspca_dev->usb_buf, 1, NULL, 500); gspca_dev->usb_buf, 1, NULL, 500);
response = gspca_dev->usb_buf[0]; response = gspca_dev->usb_buf[0];
if (retval < 0) if (retval < 0) {
err("read command [%02x] error %d", err("read command [%02x] error %d",
gspca_dev->usb_buf[0], retval); gspca_dev->usb_buf[0], retval);
return retval; gspca_dev->usb_err = retval;
}
} }
static int jlj_start(struct gspca_dev *gspca_dev) static int jlj_start(struct gspca_dev *gspca_dev)
{ {
int i; int i;
int retval = -1;
u8 response = 0xff; u8 response = 0xff;
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
struct jlj_command start_commands[] = { struct jlj_command start_commands[] = {
@ -138,16 +143,13 @@ static int jlj_start(struct gspca_dev *gspca_dev)
sd->blocks_left = 0; sd->blocks_left = 0;
for (i = 0; i < ARRAY_SIZE(start_commands); i++) { for (i = 0; i < ARRAY_SIZE(start_commands); i++) {
retval = jlj_write2(gspca_dev, start_commands[i].instruction); jlj_write2(gspca_dev, start_commands[i].instruction);
if (retval < 0)
return retval;
if (start_commands[i].ack_wanted) if (start_commands[i].ack_wanted)
retval = jlj_read1(gspca_dev, response); jlj_read1(gspca_dev, response);
if (retval < 0)
return retval;
} }
PDEBUG(D_ERR, "jlj_start retval is %d", retval); if (gspca_dev->usb_err < 0)
return retval; PDEBUG(D_ERR, "Start streaming command failed");
return gspca_dev->usb_err;
} }
static void sd_pkt_scan(struct gspca_dev *gspca_dev, static void sd_pkt_scan(struct gspca_dev *gspca_dev,
@ -250,26 +252,21 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
/* this function is called at probe and resume time */ /* this function is called at probe and resume time */
static int sd_init(struct gspca_dev *gspca_dev) static int sd_init(struct gspca_dev *gspca_dev)
{ {
return 0; return gspca_dev->usb_err;
} }
/* Set up for getting frames. */ /* Set up for getting frames. */
static int sd_start(struct gspca_dev *gspca_dev) static int sd_start(struct gspca_dev *gspca_dev)
{ {
struct sd *dev = (struct sd *) gspca_dev; struct sd *dev = (struct sd *) gspca_dev;
int ret;
/* create the JPEG header */ /* create the JPEG header */
jpeg_define(dev->jpeg_hdr, gspca_dev->height, gspca_dev->width, jpeg_define(dev->jpeg_hdr, gspca_dev->height, gspca_dev->width,
0x21); /* JPEG 422 */ 0x21); /* JPEG 422 */
jpeg_set_qual(dev->jpeg_hdr, dev->quality); jpeg_set_qual(dev->jpeg_hdr, dev->quality);
PDEBUG(D_STREAM, "Start streaming at 320x240"); PDEBUG(D_STREAM, "Start streaming at 320x240");
ret = jlj_start(gspca_dev); jlj_start(gspca_dev);
if (ret < 0) { return gspca_dev->usb_err;
PDEBUG(D_ERR, "Start streaming command failed");
return ret;
}
return 0;
} }
/* Table of supported USB devices */ /* Table of supported USB devices */