aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-09-09 16:03:47 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 16:57:50 -0400
commitc0e9eae60e8f1a18e2e6502b3e738dd2886d18ff (patch)
treee38ea84178e18100fd584afc1dce6f20c2da1153 /drivers/media
parent2f1807102a3a5c9b9782b6e8d271fc8ccef91f0a (diff)
[PATCH] v4l: change the prefix of msp34xx and error while reading chip version
- Changes the prefix to 'msp34xx' instead of 'msp3400'. - Changes the message 'error while reading chip version' to a debug printk at msp3400.c Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/msp3400.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index ca02f6f14b00..01d567cf5c68 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1452,7 +1452,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
1452 client_template.addr = addr; 1452 client_template.addr = addr;
1453 1453
1454 if (-1 == msp3400c_reset(&client_template)) { 1454 if (-1 == msp3400c_reset(&client_template)) {
1455 dprintk("msp3400: no chip found\n"); 1455 dprintk("msp34xx: no chip found\n");
1456 return -1; 1456 return -1;
1457 } 1457 }
1458 1458
@@ -1478,7 +1478,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
1478 if (-1 == msp3400c_reset(c)) { 1478 if (-1 == msp3400c_reset(c)) {
1479 kfree(msp); 1479 kfree(msp);
1480 kfree(c); 1480 kfree(c);
1481 dprintk("msp3400: no chip found\n"); 1481 dprintk("msp34xx: no chip found\n");
1482 return -1; 1482 return -1;
1483 } 1483 }
1484 1484
@@ -1488,7 +1488,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
1488 if ((-1 == msp->rev1) || (0 == msp->rev1 && 0 == msp->rev2)) { 1488 if ((-1 == msp->rev1) || (0 == msp->rev1 && 0 == msp->rev2)) {
1489 kfree(msp); 1489 kfree(msp);
1490 kfree(c); 1490 kfree(c);
1491 printk("msp3400: error while reading chip version\n"); 1491 dprintk("msp34xx: error while reading chip version\n");
1492 return -1; 1492 return -1;
1493 } 1493 }
1494 1494