aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/ivtv/ivtv-i2c.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index 50624c6a62a5..7143554234ff 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -236,7 +236,7 @@ static int ivtv_ack(struct ivtv *itv)
236 int ret = 0; 236 int ret = 0;
237 237
238 if (ivtv_getscl(itv) == 1) { 238 if (ivtv_getscl(itv) == 1) {
239 IVTV_DEBUG_I2C("SCL was high starting an ack\n"); 239 IVTV_DEBUG_HI_I2C("SCL was high starting an ack\n");
240 ivtv_setscl(itv, 0); 240 ivtv_setscl(itv, 0);
241 if (!ivtv_waitscl(itv, 0)) { 241 if (!ivtv_waitscl(itv, 0)) {
242 IVTV_DEBUG_I2C("Could not set SCL low starting an ack\n"); 242 IVTV_DEBUG_I2C("Could not set SCL low starting an ack\n");
@@ -263,7 +263,7 @@ static int ivtv_sendbyte(struct ivtv *itv, unsigned char byte)
263{ 263{
264 int i, bit; 264 int i, bit;
265 265
266 IVTV_DEBUG_I2C("write %x\n",byte); 266 IVTV_DEBUG_HI_I2C("write %x\n",byte);
267 for (i = 0; i < 8; ++i, byte<<=1) { 267 for (i = 0; i < 8; ++i, byte<<=1) {
268 ivtv_setscl(itv, 0); 268 ivtv_setscl(itv, 0);
269 if (!ivtv_waitscl(itv, 0)) { 269 if (!ivtv_waitscl(itv, 0)) {
@@ -318,7 +318,7 @@ static int ivtv_readbyte(struct ivtv *itv, unsigned char *byte, int nack)
318 ivtv_scldelay(itv); 318 ivtv_scldelay(itv);
319 ivtv_setscl(itv, 0); 319 ivtv_setscl(itv, 0);
320 ivtv_scldelay(itv); 320 ivtv_scldelay(itv);
321 IVTV_DEBUG_I2C("read %x\n",*byte); 321 IVTV_DEBUG_HI_I2C("read %x\n",*byte);
322 return 0; 322 return 0;
323} 323}
324 324
@@ -330,7 +330,7 @@ static int ivtv_start(struct ivtv *itv)
330 330
331 sda = ivtv_getsda(itv); 331 sda = ivtv_getsda(itv);
332 if (sda != 1) { 332 if (sda != 1) {
333 IVTV_DEBUG_I2C("SDA was low at start\n"); 333 IVTV_DEBUG_HI_I2C("SDA was low at start\n");
334 ivtv_setsda(itv, 1); 334 ivtv_setsda(itv, 1);
335 if (!ivtv_waitsda(itv, 1)) { 335 if (!ivtv_waitsda(itv, 1)) {
336 IVTV_DEBUG_I2C("SDA stuck low\n"); 336 IVTV_DEBUG_I2C("SDA stuck low\n");
@@ -355,7 +355,7 @@ static int ivtv_stop(struct ivtv *itv)
355 int i; 355 int i;
356 356
357 if (ivtv_getscl(itv) != 0) { 357 if (ivtv_getscl(itv) != 0) {
358 IVTV_DEBUG_I2C("SCL not low when stopping\n"); 358 IVTV_DEBUG_HI_I2C("SCL not low when stopping\n");
359 ivtv_setscl(itv, 0); 359 ivtv_setscl(itv, 0);
360 if (!ivtv_waitscl(itv, 0)) { 360 if (!ivtv_waitscl(itv, 0)) {
361 IVTV_DEBUG_I2C("SCL could not be set low\n"); 361 IVTV_DEBUG_I2C("SCL could not be set low\n");