summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorSteven Toth <stoth@kernellabs.com>2009-05-12 09:13:11 -0400
committerSteven Toth <stoth@kernellabs.com>2009-05-12 09:13:11 -0400
commit7749ba4cad48f7e17b571e32832b1d99226bcb83 (patch)
tree75f443d2b5aa5d23da3cb016dc6e7f883ea988b2 /linux
parent147479b84ed012a89cff5a4e81dc6b96cafd16b8 (diff)
downloadmediapointer-dvb-s2-7749ba4cad48f7e17b571e32832b1d99226bcb83.tar.gz
mediapointer-dvb-s2-7749ba4cad48f7e17b571e32832b1d99226bcb83.tar.bz2
SAA7164: Removed spurious I2C errors during driver load with DVB-T boards.
From: Steven Toth <stoth@kernellabs.com> SAA7164: Removed spurious I2C errors during driver load with DVB-T boards. Priority: normal Signed-off-by: Steven Toth <stoth@kernellabs.com>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/saa7164/saa7164-api.c2
-rw-r--r--linux/drivers/media/video/saa7164/saa7164-core.c3
-rw-r--r--linux/drivers/media/video/saa7164/saa7164.h1
3 files changed, 2 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7164/saa7164-api.c b/linux/drivers/media/video/saa7164/saa7164-api.c
index 5232fc45d..854a57f3a 100644
--- a/linux/drivers/media/video/saa7164/saa7164-api.c
+++ b/linux/drivers/media/video/saa7164/saa7164-api.c
@@ -60,6 +60,7 @@ int saa7164_api_read_eeprom(struct saa7164_dev *dev, u8 *buf, int buflen)
&reg[0], 128, buf);
}
+#if 0
/* Exercise the i2c interface, saa7164_cmd()/bus() layers:
* 1. Read the identity byte from each of the demodulators.
* 2. Read the entire register set from the TDA18271.
@@ -86,6 +87,7 @@ int saa7164_api_test(struct saa7164_dev *dev)
return 0;
}
+#endif
int saa7164_api_configure_port_mpeg2ts(struct saa7164_dev *dev,
struct saa7164_tsport *port,
diff --git a/linux/drivers/media/video/saa7164/saa7164-core.c b/linux/drivers/media/video/saa7164/saa7164-core.c
index bf347fb0e..75f7a9b38 100644
--- a/linux/drivers/media/video/saa7164/saa7164-core.c
+++ b/linux/drivers/media/video/saa7164/saa7164-core.c
@@ -695,9 +695,6 @@ static int __devinit saa7164_initdev(struct pci_dev *pci_dev,
*/
saa7164_api_enum_subdevs(dev);
- /* Try a few API commands - just for exercise purposes */
- saa7164_api_test(dev);
-
/* Begin to create the video sub-systems and register funcs */
if (saa7164_boards[dev->board].porta == SAA7164_MPEG_DVB) {
if (saa7164_dvb_register(&dev->ts1) < 0) {
diff --git a/linux/drivers/media/video/saa7164/saa7164.h b/linux/drivers/media/video/saa7164/saa7164.h
index 7a0e1765e..bc8b2e5b7 100644
--- a/linux/drivers/media/video/saa7164/saa7164.h
+++ b/linux/drivers/media/video/saa7164/saa7164.h
@@ -330,7 +330,6 @@ void saa7164_cmd_signal(struct saa7164_dev *dev, u8 seqno);
/* ----------------------------------------------------------- */
/* saa7164-api.c */
-int saa7164_api_test(struct saa7164_dev *dev);
int saa7164_api_get_fw_version(struct saa7164_dev *dev, u32 *version);
int saa7164_api_enum_subdevs(struct saa7164_dev *dev);
int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 addr, u32 reglen, u8 *reg,