aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ov511.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/ov511.c')
-rw-r--r--drivers/media/video/ov511.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index 935d73de57bd..210f1240b331 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -1098,9 +1098,10 @@ ov51x_clear_snapshot(struct usb_ov511 *ov)
1098 reg_w(ov, R51x_SYS_SNAP, 0x02); 1098 reg_w(ov, R51x_SYS_SNAP, 0x02);
1099 reg_w(ov, R51x_SYS_SNAP, 0x00); 1099 reg_w(ov, R51x_SYS_SNAP, 0x00);
1100 } else if (ov->bclass == BCL_OV518) { 1100 } else if (ov->bclass == BCL_OV518) {
1101 warn("snapshot reset not supported yet on OV518(+)"); 1101 dev_warn(&ov->dev->dev,
1102 "snapshot reset not supported yet on OV518(+)\n");
1102 } else { 1103 } else {
1103 err("clear snap: invalid bridge type"); 1104 dev_err(&ov->dev->dev, "clear snap: invalid bridge type\n");
1104 } 1105 }
1105} 1106}
1106 1107
@@ -1115,14 +1116,16 @@ ov51x_check_snapshot(struct usb_ov511 *ov)
1115 if (ov->bclass == BCL_OV511) { 1116 if (ov->bclass == BCL_OV511) {
1116 ret = reg_r(ov, R51x_SYS_SNAP); 1117 ret = reg_r(ov, R51x_SYS_SNAP);
1117 if (ret < 0) { 1118 if (ret < 0) {
1118 err("Error checking snspshot status (%d)", ret); 1119 dev_err(&ov->dev->dev,
1120 "Error checking snspshot status (%d)\n", ret);
1119 } else if (ret & 0x08) { 1121 } else if (ret & 0x08) {
1120 status = 1; 1122 status = 1;
1121 } 1123 }
1122 } else if (ov->bclass == BCL_OV518) { 1124 } else if (ov->bclass == BCL_OV518) {
1123 warn("snapshot check not supported yet on OV518(+)"); 1125 dev_warn(&ov->dev->dev,
1126 "snapshot check not supported yet on OV518(+)\n");
1124 } else { 1127 } else {
1125 err("check snap: invalid bridge type"); 1128 dev_err(&ov->dev->dev, "clear snap: invalid bridge type\n");
1126 } 1129 }
1127 1130
1128 return status; 1131 return status;
@@ -5217,7 +5220,8 @@ saa7111a_configure(struct usb_ov511 *ov)
5217 if (ov->bclass == BCL_OV511) 5220 if (ov->bclass == BCL_OV511)
5218 reg_w(ov, 0x11, 0x00); 5221 reg_w(ov, 0x11, 0x00);
5219 else 5222 else
5220 warn("SAA7111A not yet supported with OV518/OV518+"); 5223 dev_warn(&ov->dev->dev,
5224 "SAA7111A not yet supported with OV518/OV518+\n");
5221 5225
5222 return 0; 5226 return 0;
5223} 5227}
@@ -5456,7 +5460,8 @@ ov518_configure(struct usb_ov511 *ov)
5456 * required. OV518 has no uncompressed mode, to save RAM. */ 5460 * required. OV518 has no uncompressed mode, to save RAM. */
5457 if (!dumppix && !ov->compress) { 5461 if (!dumppix && !ov->compress) {
5458 ov->compress = 1; 5462 ov->compress = 1;
5459 warn("Compression required with OV518...enabling"); 5463 dev_warn(&ov->dev->dev,
5464 "Compression required with OV518...enabling\n");
5460 } 5465 }
5461 5466
5462 if (ov->bridge == BRG_OV518) { 5467 if (ov->bridge == BRG_OV518) {