diff options
author | Jean-François Moine <moinejf@free.fr> | 2010-09-13 04:19:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:05:53 -0400 |
commit | 0b656321f338a2e5e3d9a9bdce959a2d76857967 (patch) | |
tree | 2f1581be1e243ace0cb25a255b71aa09fc4aa2ce /drivers/media/video/gspca/sq930x.c | |
parent | 548264375b1c0d51b418bf7ab6d2fec647307ab7 (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/sq930x.c')
-rw-r--r-- | drivers/media/video/gspca/sq930x.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/gspca/sq930x.c b/drivers/media/video/gspca/sq930x.c index 8edffed24a0d..3e4b0b94c700 100644 --- a/drivers/media/video/gspca/sq930x.c +++ b/drivers/media/video/gspca/sq930x.c | |||
@@ -468,7 +468,7 @@ static void reg_r(struct gspca_dev *gspca_dev, | |||
468 | value, 0, gspca_dev->usb_buf, len, | 468 | value, 0, gspca_dev->usb_buf, len, |
469 | 500); | 469 | 500); |
470 | if (ret < 0) { | 470 | if (ret < 0) { |
471 | PDEBUG(D_ERR, "reg_r %04x failed %d", value, ret); | 471 | err("reg_r %04x failed %d", value, ret); |
472 | gspca_dev->usb_err = ret; | 472 | gspca_dev->usb_err = ret; |
473 | } | 473 | } |
474 | } | 474 | } |
@@ -488,7 +488,7 @@ static void reg_w(struct gspca_dev *gspca_dev, u16 value, u16 index) | |||
488 | 500); | 488 | 500); |
489 | msleep(30); | 489 | msleep(30); |
490 | if (ret < 0) { | 490 | if (ret < 0) { |
491 | PDEBUG(D_ERR, "reg_w %04x %04x failed %d", value, index, ret); | 491 | err("reg_w %04x %04x failed %d", value, index, ret); |
492 | gspca_dev->usb_err = ret; | 492 | gspca_dev->usb_err = ret; |
493 | } | 493 | } |
494 | } | 494 | } |
@@ -511,7 +511,7 @@ static void reg_wb(struct gspca_dev *gspca_dev, u16 value, u16 index, | |||
511 | 1000); | 511 | 1000); |
512 | msleep(30); | 512 | msleep(30); |
513 | if (ret < 0) { | 513 | if (ret < 0) { |
514 | PDEBUG(D_ERR, "reg_wb %04x %04x failed %d", value, index, ret); | 514 | err("reg_wb %04x %04x failed %d", value, index, ret); |
515 | gspca_dev->usb_err = ret; | 515 | gspca_dev->usb_err = ret; |
516 | } | 516 | } |
517 | } | 517 | } |
@@ -556,7 +556,7 @@ static void i2c_write(struct sd *sd, | |||
556 | gspca_dev->usb_buf, buf - gspca_dev->usb_buf, | 556 | gspca_dev->usb_buf, buf - gspca_dev->usb_buf, |
557 | 500); | 557 | 500); |
558 | if (ret < 0) { | 558 | if (ret < 0) { |
559 | PDEBUG(D_ERR, "i2c_write failed %d", ret); | 559 | err("i2c_write failed %d", ret); |
560 | gspca_dev->usb_err = ret; | 560 | gspca_dev->usb_err = ret; |
561 | } | 561 | } |
562 | } | 562 | } |
@@ -612,7 +612,7 @@ static void ucbus_write(struct gspca_dev *gspca_dev, | |||
612 | gspca_dev->usb_buf, buf - gspca_dev->usb_buf, | 612 | gspca_dev->usb_buf, buf - gspca_dev->usb_buf, |
613 | 500); | 613 | 500); |
614 | if (ret < 0) { | 614 | if (ret < 0) { |
615 | PDEBUG(D_ERR, "ucbus_write failed %d", ret); | 615 | err("ucbus_write failed %d", ret); |
616 | gspca_dev->usb_err = ret; | 616 | gspca_dev->usb_err = ret; |
617 | return; | 617 | return; |
618 | } | 618 | } |
@@ -688,7 +688,7 @@ static void cmos_probe(struct gspca_dev *gspca_dev) | |||
688 | break; | 688 | break; |
689 | } | 689 | } |
690 | if (i >= ARRAY_SIZE(probe_order)) | 690 | if (i >= ARRAY_SIZE(probe_order)) |
691 | PDEBUG(D_PROBE, "Unknown sensor"); | 691 | err("Unknown sensor"); |
692 | else | 692 | else |
693 | sd->sensor = probe_order[i]; | 693 | sd->sensor = probe_order[i]; |
694 | } | 694 | } |
@@ -1079,7 +1079,7 @@ static void sd_dq_callback(struct gspca_dev *gspca_dev) | |||
1079 | gspca_dev->cam.bulk_nurbs = 1; | 1079 | gspca_dev->cam.bulk_nurbs = 1; |
1080 | ret = usb_submit_urb(gspca_dev->urb[0], GFP_ATOMIC); | 1080 | ret = usb_submit_urb(gspca_dev->urb[0], GFP_ATOMIC); |
1081 | if (ret < 0) | 1081 | if (ret < 0) |
1082 | PDEBUG(D_ERR|D_PACK, "sd_dq_callback() err %d", ret); | 1082 | err("sd_dq_callback() err %d", ret); |
1083 | 1083 | ||
1084 | /* wait a little time, otherwise the webcam crashes */ | 1084 | /* wait a little time, otherwise the webcam crashes */ |
1085 | msleep(100); | 1085 | msleep(100); |