aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2013-12-23 06:12:21 -0500
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-07 05:46:51 -0500
commit6f64eb0ed246c0e8b2a10bb4d2403ed05445da57 (patch)
treecc6b08c69de72d4b27d5b1f14b80a82d62cf3d47
parent687ff8b0c489e8bb3a4a3da291e830fa7cfafe22 (diff)
[media] cx231xx: Add missing KERN_CONT to i2c debug prints
Fix continuation lines. [m.chehab@samsung.com: This was actually part of a v2 patch meant to fix i2c debug prints. As version 1 was already applied, I'm applying here the diff and fixing the patch subject/description] Signed-off-by: Matthias Schwarzott <zzam@gentoo.org> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-i2c.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c
index a0d223576c80..7c0f797f1057 100644
--- a/drivers/media/usb/cx231xx/cx231xx-i2c.c
+++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c
@@ -390,7 +390,7 @@ static int cx231xx_i2c_xfer(struct i2c_adapter *i2c_adap,
390 rc = cx231xx_i2c_recv_bytes(i2c_adap, &msgs[i]); 390 rc = cx231xx_i2c_recv_bytes(i2c_adap, &msgs[i]);
391 if (i2c_debug >= 2) { 391 if (i2c_debug >= 2) {
392 for (byte = 0; byte < msgs[i].len; byte++) 392 for (byte = 0; byte < msgs[i].len; byte++)
393 printk(" %02x", msgs[i].buf[byte]); 393 printk(KERN_CONT " %02x", msgs[i].buf[byte]);
394 } 394 }
395 } else if (i + 1 < num && (msgs[i + 1].flags & I2C_M_RD) && 395 } else if (i + 1 < num && (msgs[i + 1].flags & I2C_M_RD) &&
396 msgs[i].addr == msgs[i + 1].addr 396 msgs[i].addr == msgs[i + 1].addr
@@ -398,7 +398,8 @@ static int cx231xx_i2c_xfer(struct i2c_adapter *i2c_adap,
398 /* write bytes */ 398 /* write bytes */
399 if (i2c_debug >= 2) { 399 if (i2c_debug >= 2) {
400 for (byte = 0; byte < msgs[i].len; byte++) 400 for (byte = 0; byte < msgs[i].len; byte++)
401 printk(" %02x", msgs[i].buf[byte]); 401 printk(KERN_CONT " %02x", msgs[i].buf[byte]);
402 printk(KERN_CONT "\n");
402 } 403 }
403 /* read bytes */ 404 /* read bytes */
404 dprintk2(2, "plus %s %s addr=0x%x len=%d:", 405 dprintk2(2, "plus %s %s addr=0x%x len=%d:",
@@ -409,21 +410,21 @@ static int cx231xx_i2c_xfer(struct i2c_adapter *i2c_adap,
409 &msgs[i + 1]); 410 &msgs[i + 1]);
410 if (i2c_debug >= 2) { 411 if (i2c_debug >= 2) {
411 for (byte = 0; byte < msgs[i+1].len; byte++) 412 for (byte = 0; byte < msgs[i+1].len; byte++)
412 printk(" %02x", msgs[i+1].buf[byte]); 413 printk(KERN_CONT " %02x", msgs[i+1].buf[byte]);
413 } 414 }
414 i++; 415 i++;
415 } else { 416 } else {
416 /* write bytes */ 417 /* write bytes */
417 if (i2c_debug >= 2) { 418 if (i2c_debug >= 2) {
418 for (byte = 0; byte < msgs[i].len; byte++) 419 for (byte = 0; byte < msgs[i].len; byte++)
419 printk(" %02x", msgs[i].buf[byte]); 420 printk(KERN_CONT " %02x", msgs[i].buf[byte]);
420 } 421 }
421 rc = cx231xx_i2c_send_bytes(i2c_adap, &msgs[i]); 422 rc = cx231xx_i2c_send_bytes(i2c_adap, &msgs[i]);
422 } 423 }
423 if (rc < 0) 424 if (rc < 0)
424 goto err; 425 goto err;
425 if (i2c_debug >= 2) 426 if (i2c_debug >= 2)
426 printk("\n"); 427 printk(KERN_CONT "\n");
427 } 428 }
428 mutex_unlock(&dev->i2c_lock); 429 mutex_unlock(&dev->i2c_lock);
429 return num; 430 return num;