Skip to content

Commit

Permalink
V4L/DVB: gspca - all modules: Display error messages when gspca debug…
Browse files Browse the repository at this point in the history 
… disabled

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Jean-François Moine authored and Mauro Carvalho Chehab committed Oct 21, 2010
1 parent 5482643 commit 0b65632
Show file tree
Hide file tree
Showing 35 changed files with 147 additions and 167 deletions.
4 changes: 2 additions & 2 deletions drivers/media/video/gspca/cpia1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ static int cpia_usb_transferCmd(struct gspca_dev *gspca_dev, u8 *command)
gspca_dev->usb_buf, databytes, 1000);

if (ret < 0)
PDEBUG(D_ERR, "usb_control_msg %02x, error %d", command[1],
err("usb_control_msg %02x, error %d", command[1],
ret);

if (ret == -EPIPE && retries > 0) {
Expand Down Expand Up @@ -1236,7 +1236,7 @@ static void monitor_exposure(struct gspca_dev *gspca_dev)
cmd[7] = 0;
ret = cpia_usb_transferCmd(gspca_dev, cmd);
if (ret) {
PDEBUG(D_ERR, "ReadVPRegs(30,4,9,8) - failed: %d", ret);
err("ReadVPRegs(30,4,9,8) - failed: %d", ret);
return;
}
exp_acc = gspca_dev->usb_buf[0];
Expand Down
6 changes: 3 additions & 3 deletions drivers/media/video/gspca/finepix.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
/* Init the device */
ret = command(gspca_dev, 0);
if (ret < 0) {
PDEBUG(D_STREAM, "init failed %d", ret);
err("init failed %d", ret);
return ret;
}

Expand All @@ -194,14 +194,14 @@ static int sd_start(struct gspca_dev *gspca_dev)
FPIX_MAX_TRANSFER, &len,
FPIX_TIMEOUT);
if (ret < 0) {
PDEBUG(D_STREAM, "usb_bulk_msg failed %d", ret);
err("usb_bulk_msg failed %d", ret);
return ret;
}

/* Request a frame, but don't read it */
ret = command(gspca_dev, 1);
if (ret < 0) {
PDEBUG(D_STREAM, "frame request failed %d", ret);
err("frame request failed %d", ret);
return ret;
}

Expand Down
3 changes: 1 addition & 2 deletions drivers/media/video/gspca/gl860/gl860.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,8 +585,7 @@ int gl860_RTx(struct gspca_dev *gspca_dev,
}

if (r < 0)
PDEBUG(D_ERR,
"ctrl transfer failed %4d "
err("ctrl transfer failed %4d "
"[p%02x r%d v%04x i%04x len%d]",
r, pref, req, val, index, len);
else if (len > 1 && r < len)
Expand Down
20 changes: 9 additions & 11 deletions drivers/media/video/gspca/gspca.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ static void int_irq(struct urb *urb)
if (ret == 0) {
ret = usb_submit_urb(urb, GFP_ATOMIC);
if (ret < 0)
PDEBUG(D_ERR, "Resubmit URB failed with error %i", ret);
err("Resubmit URB failed with error %i", ret);
}
}

Expand Down Expand Up @@ -177,8 +177,8 @@ static int gspca_input_connect(struct gspca_dev *dev)

err = input_register_device(input_dev);
if (err) {
PDEBUG(D_ERR, "Input device registration failed "
"with error %i", err);
err("Input device registration failed with error %i",
err);
input_dev->dev.parent = NULL;
input_free_device(input_dev);
} else {
Expand Down Expand Up @@ -328,8 +328,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,
}
st = urb->iso_frame_desc[i].status;
if (st) {
PDEBUG(D_ERR,
"ISOC data error: [%d] len=%d, status=%d",
err("ISOC data error: [%d] len=%d, status=%d",
i, len, st);
gspca_dev->last_packet_type = DISCARD_PACKET;
continue;
Expand All @@ -347,7 +346,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,
/* resubmit the URB */
st = usb_submit_urb(urb, GFP_ATOMIC);
if (st < 0)
PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st);
err("usb_submit_urb() ret %d", st);
}

/*
Expand Down Expand Up @@ -401,7 +400,7 @@ static void bulk_irq(struct urb *urb)
if (gspca_dev->cam.bulk_nurbs != 0) {
st = usb_submit_urb(urb, GFP_ATOMIC);
if (st < 0)
PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st);
err("usb_submit_urb() ret %d", st);
}
}

Expand Down Expand Up @@ -590,7 +589,7 @@ static int gspca_set_alt0(struct gspca_dev *gspca_dev)
return 0;
ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface, 0);
if (ret < 0)
PDEBUG(D_ERR|D_STREAM, "set alt 0 err %d", ret);
err("set alt 0 err %d", ret);
return ret;
}

Expand Down Expand Up @@ -850,8 +849,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
break;
gspca_stream_off(gspca_dev);
if (ret != -ENOSPC) {
PDEBUG(D_ERR|D_STREAM,
"usb_submit_urb alt %d err %d",
err("usb_submit_urb alt %d err %d",
gspca_dev->alt, ret);
goto out;
}
Expand Down Expand Up @@ -2243,7 +2241,7 @@ int gspca_dev_probe(struct usb_interface *intf,

/* we don't handle multi-config cameras */
if (dev->descriptor.bNumConfigurations != 1) {
PDEBUG(D_ERR, "%04x:%04x too many config",
err("%04x:%04x too many config",
id->idVendor, id->idProduct);
return -ENODEV;
}
Expand Down
6 changes: 3 additions & 3 deletions drivers/media/video/gspca/jeilinj.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static int jlj_write2(struct gspca_dev *gspca_dev, unsigned char *command)
usb_sndbulkpipe(gspca_dev->dev, 3),
gspca_dev->usb_buf, 2, NULL, 500);
if (retval < 0)
PDEBUG(D_ERR, "command write [%02x] error %d",
err("command write [%02x] error %d",
gspca_dev->usb_buf[0], retval);
return retval;
}
Expand All @@ -97,7 +97,7 @@ static int jlj_read1(struct gspca_dev *gspca_dev, unsigned char response)
gspca_dev->usb_buf, 1, NULL, 500);
response = gspca_dev->usb_buf[0];
if (retval < 0)
PDEBUG(D_ERR, "read command [%02x] error %d",
err("read command [%02x] error %d",
gspca_dev->usb_buf[0], retval);
return retval;
}
Expand Down Expand Up @@ -191,7 +191,7 @@ static void jlj_dostream(struct work_struct *work)

buffer = kmalloc(JEILINJ_MAX_TRANSFER, GFP_KERNEL | GFP_DMA);
if (!buffer) {
PDEBUG(D_ERR, "Couldn't allocate USB buffer");
err("Couldn't allocate USB buffer");
goto quit_stream;
}
while (gspca_dev->present && gspca_dev->streaming) {
Expand Down
10 changes: 5 additions & 5 deletions drivers/media/video/gspca/konica.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ static void reg_w(struct gspca_dev *gspca_dev, u16 value, u16 index)
0,
1000);
if (ret < 0) {
PDEBUG(D_ERR, "reg_w err %d", ret);
err("reg_w err %d", ret);
gspca_dev->usb_err = ret;
}
}
Expand All @@ -221,7 +221,7 @@ static void reg_r(struct gspca_dev *gspca_dev, u16 value, u16 index)
2,
1000);
if (ret < 0) {
PDEBUG(D_ERR, "reg_w err %d", ret);
err("reg_w err %d", ret);
gspca_dev->usb_err = ret;
}
}
Expand Down Expand Up @@ -284,7 +284,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
intf = usb_ifnum_to_if(sd->gspca_dev.dev, sd->gspca_dev.iface);
alt = usb_altnum_to_altsetting(intf, sd->gspca_dev.alt);
if (!alt) {
PDEBUG(D_ERR, "Couldn't get altsetting");
err("Couldn't get altsetting");
return -EIO;
}

Expand Down Expand Up @@ -386,7 +386,7 @@ static void sd_isoc_irq(struct urb *urb)
PDEBUG(D_ERR, "urb status: %d", urb->status);
st = usb_submit_urb(urb, GFP_ATOMIC);
if (st < 0)
PDEBUG(D_ERR|D_PACK, "resubmit urb error %d", st);
err("resubmit urb error %d", st);
return;
}

Expand Down Expand Up @@ -477,7 +477,7 @@ static void sd_isoc_irq(struct urb *urb)
}
st = usb_submit_urb(status_urb, GFP_ATOMIC);
if (st < 0)
PDEBUG(D_ERR|D_PACK, "usb_submit_urb(status_urb) ret %d", st);
err("usb_submit_urb(status_urb) ret %d", st);
}

static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/gspca/mars.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ static int reg_w(struct gspca_dev *gspca_dev,
&alen,
500); /* timeout in milliseconds */
if (ret < 0)
PDEBUG(D_ERR, "reg write [%02x] error %d",
err("reg write [%02x] error %d",
gspca_dev->usb_buf[0], ret);
return ret;
}
Expand Down
20 changes: 9 additions & 11 deletions drivers/media/video/gspca/mr97310a.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ static int mr_write(struct gspca_dev *gspca_dev, int len)
usb_sndbulkpipe(gspca_dev->dev, 4),
gspca_dev->usb_buf, len, NULL, 500);
if (rc < 0)
PDEBUG(D_ERR, "reg write [%02x] error %d",
err("reg write [%02x] error %d",
gspca_dev->usb_buf[0], rc);
return rc;
}
Expand All @@ -281,7 +281,7 @@ static int mr_read(struct gspca_dev *gspca_dev, int len)
usb_rcvbulkpipe(gspca_dev->dev, 3),
gspca_dev->usb_buf, len, NULL, 500);
if (rc < 0)
PDEBUG(D_ERR, "reg read [%02x] error %d",
err("reg read [%02x] error %d",
gspca_dev->usb_buf[0], rc);
return rc;
}
Expand Down Expand Up @@ -540,7 +540,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
sd->sensor_type = 1;
break;
default:
PDEBUG(D_ERR, "Unknown CIF Sensor id : %02x",
err("Unknown CIF Sensor id : %02x",
gspca_dev->usb_buf[1]);
return -ENODEV;
}
Expand Down Expand Up @@ -575,10 +575,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
sd->sensor_type = 2;
} else if ((gspca_dev->usb_buf[0] != 0x03) &&
(gspca_dev->usb_buf[0] != 0x04)) {
PDEBUG(D_ERR, "Unknown VGA Sensor id Byte 0: %02x",
err("Unknown VGA Sensor id Byte 0: %02x",
gspca_dev->usb_buf[0]);
PDEBUG(D_ERR, "Defaults assumed, may not work");
PDEBUG(D_ERR, "Please report this");
err("Defaults assumed, may not work");
err("Please report this");
}
/* Sakar Digital color needs to be adjusted. */
if ((gspca_dev->usb_buf[0] == 0x03) &&
Expand All @@ -595,12 +595,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
/* Nothing to do here. */
break;
default:
PDEBUG(D_ERR,
"Unknown VGA Sensor id Byte 1: %02x",
err("Unknown VGA Sensor id Byte 1: %02x",
gspca_dev->usb_buf[1]);
PDEBUG(D_ERR,
"Defaults assumed, may not work");
PDEBUG(D_ERR, "Please report this");
err("Defaults assumed, may not work");
err("Please report this");
}
}
PDEBUG(D_PROBE, "MR97310A VGA camera detected, sensor: %d",
Expand Down
Loading

0 comments on commit 0b65632

Please sign in to comment.