summaryrefslogtreecommitdiff
path: root/linux/drivers/media/common
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/common')
-rw-r--r--linux/drivers/media/common/saa7146.h1
-rw-r--r--linux/drivers/media/common/saa7146_core.c5
2 files changed, 0 insertions, 6 deletions
diff --git a/linux/drivers/media/common/saa7146.h b/linux/drivers/media/common/saa7146.h
index 907989cfe..b5ee99d64 100644
--- a/linux/drivers/media/common/saa7146.h
+++ b/linux/drivers/media/common/saa7146.h
@@ -89,7 +89,6 @@ struct saa7146_extension
#endif
/* extension functions */
- int (*preinit)(struct saa7146_dev*);
int (*probe)(struct saa7146_dev*, unsigned int subvendor, unsigned int subdevice);
int (*attach)(struct saa7146_dev *, struct saa7146_sub_info *);
int (*detach)(struct saa7146_dev*);
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c
index 432fa4f4e..bd079b0e5 100644
--- a/linux/drivers/media/common/saa7146_core.c
+++ b/linux/drivers/media/common/saa7146_core.c
@@ -229,11 +229,6 @@ void try_attach_extension_and_device(struct saa7146_dev *dev, struct saa7146_ext
return;
}
- if( 0 != ext->preinit(dev) ) {
- DEB_S(("ext->preinit() failed for %p. skipping.\n",dev));
- return;
- }
-
if( 0 != ext->probe) {
if( 0 != ext->probe(dev, dev->pci->subsystem_vendor, dev->pci->subsystem_device) ) {
DEB_D(("ext->probe() failed for %p. skipping device.\n",dev));