summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-08-20 17:34:04 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-08-20 17:34:04 +0000
commit58601beba6b1d4893e9eff133587bdf85e383e2a (patch)
tree6b8639c2c571f22598686fc7772e01ca4deb0d7a
parentc18097bd15efba1c5f47723acb0d6fd7904b6e93 (diff)
downloadmediapointer-dvb-s2-58601beba6b1d4893e9eff133587bdf85e383e2a.tar.gz
mediapointer-dvb-s2-58601beba6b1d4893e9eff133587bdf85e383e2a.tar.bz2
- 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>
-rw-r--r--linux/drivers/media/video/msp3400-driver.c6
-rw-r--r--linux/drivers/media/video/msp3400.c6
-rw-r--r--v4l/ChangeLog10
3 files changed, 16 insertions, 6 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 4d81952ff..fa2e82800 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -1484,7 +1484,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
client_template.addr = addr;
if (-1 == msp3400c_reset(&client_template)) {
- dprintk("msp3400: no chip found\n");
+ dprintk("msp34xx: no chip found\n");
return -1;
}
@@ -1510,7 +1510,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
if (-1 == msp3400c_reset(c)) {
kfree(msp);
kfree(c);
- dprintk("msp3400: no chip found\n");
+ dprintk("msp34xx: no chip found\n");
return -1;
}
@@ -1520,7 +1520,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
if ((-1 == msp->rev1) || (0 == msp->rev1 && 0 == msp->rev2)) {
kfree(msp);
kfree(c);
- printk("msp3400: error while reading chip version\n");
+ dprintk("msp34xx: error while reading chip version\n");
return -1;
}
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 4d81952ff..fa2e82800 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -1484,7 +1484,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
client_template.addr = addr;
if (-1 == msp3400c_reset(&client_template)) {
- dprintk("msp3400: no chip found\n");
+ dprintk("msp34xx: no chip found\n");
return -1;
}
@@ -1510,7 +1510,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
if (-1 == msp3400c_reset(c)) {
kfree(msp);
kfree(c);
- dprintk("msp3400: no chip found\n");
+ dprintk("msp34xx: no chip found\n");
return -1;
}
@@ -1520,7 +1520,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
if ((-1 == msp->rev1) || (0 == msp->rev1 && 0 == msp->rev2)) {
kfree(msp);
kfree(c);
- printk("msp3400: error while reading chip version\n");
+ dprintk("msp34xx: error while reading chip version\n");
return -1;
}
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 9343c13eb..096db12e1 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-20 17:30
+
+ * msp3400.c: (msp_attach):
+ - Changes the prefix to 'msp34xx' instead of 'msp3400'.
+ - Changes the message 'error while reading chip version' to a
+ debug printk.
+
+ Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-08-20 14:03 mkrufky
* bttv-i2c.c: