aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/zc3xx.c
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2010-09-13 04:19:58 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:05:53 -0400
commit0b656321f338a2e5e3d9a9bdce959a2d76857967 (patch)
tree2f1581be1e243ace0cb25a255b71aa09fc4aa2ce /drivers/media/video/gspca/zc3xx.c
parent548264375b1c0d51b418bf7ab6d2fec647307ab7 (diff)
V4L/DVB: gspca - all modules: Display error messages when gspca debug disabled
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/zc3xx.c')
-rw-r--r--drivers/media/video/gspca/zc3xx.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index 71d2b1be6f66..e2f1a0e1e2c2 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -5698,7 +5698,7 @@ static u8 reg_r_i(struct gspca_dev *gspca_dev,
5698 index, gspca_dev->usb_buf, 1, 5698 index, gspca_dev->usb_buf, 1,
5699 500); 5699 500);
5700 if (ret < 0) { 5700 if (ret < 0) {
5701 PDEBUG(D_ERR, "reg_r_i err %d", ret); 5701 err("reg_r_i err %d", ret);
5702 gspca_dev->usb_err = ret; 5702 gspca_dev->usb_err = ret;
5703 return 0; 5703 return 0;
5704 } 5704 }
@@ -5730,7 +5730,7 @@ static void reg_w_i(struct gspca_dev *gspca_dev,
5730 value, index, NULL, 0, 5730 value, index, NULL, 0,
5731 500); 5731 500);
5732 if (ret < 0) { 5732 if (ret < 0) {
5733 PDEBUG(D_ERR, "reg_w_i err %d", ret); 5733 err("reg_w_i err %d", ret);
5734 gspca_dev->usb_err = ret; 5734 gspca_dev->usb_err = ret;
5735 } 5735 }
5736} 5736}
@@ -6503,8 +6503,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
6503 PDEBUG(D_PROBE, "Sensor Tas5130 (VF0250)"); 6503 PDEBUG(D_PROBE, "Sensor Tas5130 (VF0250)");
6504 break; 6504 break;
6505 default: 6505 default:
6506 PDEBUG(D_PROBE, 6506 warn("Unknown sensor - set to TAS5130C");
6507 "Unknown sensor - set to TAS5130C");
6508 sd->sensor = SENSOR_TAS5130C; 6507 sd->sensor = SENSOR_TAS5130C;
6509 } 6508 }
6510 break; 6509 break;
@@ -6610,7 +6609,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
6610 sd->sensor = SENSOR_OV7620; /* same sensor (?) */ 6609 sd->sensor = SENSOR_OV7620; /* same sensor (?) */
6611 break; 6610 break;
6612 default: 6611 default:
6613 PDEBUG(D_ERR|D_PROBE, "Unknown sensor %04x", sensor); 6612 err("Unknown sensor %04x", sensor);
6614 return -EINVAL; 6613 return -EINVAL;
6615 } 6614 }
6616 } 6615 }