summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2009-03-06 20:51:35 -0600
committerMike Isely <isely@pobox.com>2009-03-06 20:51:35 -0600
commit2fda0e83cd23f41e475d8170f9dfbc67a4ffa249 (patch)
tree7463c91b9a83c260b98b0a7347976e08bb717bc7 /linux/drivers/media
parent0e8baa62ef0d5a0ffe4b2372f670cd8308f6d7e9 (diff)
downloadmediapointer-dvb-s2-2fda0e83cd23f41e475d8170f9dfbc67a4ffa249.tar.gz
mediapointer-dvb-s2-2fda0e83cd23f41e475d8170f9dfbc67a4ffa249.tar.bz2
pvrusb2: Set i2c autoprobing to be off by default
From: Mike Isely <isely@pobox.com> In order to keep a sub-device from promiscuously attaching to the pvrusb2 driver, the i2c adapter's class must be cleared. This change clears that class by default. Priority: normal Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 5c959e467..c1f613591 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -618,7 +618,7 @@ static struct i2c_algorithm pvr2_i2c_algo_template = {
static struct i2c_adapter pvr2_i2c_adap_template = {
.owner = THIS_MODULE,
- .class = I2C_CLASS_TV_ANALOG,
+ .class = 0,
.id = I2C_HW_B_BT848,
.client_register = pvr2_i2c_attach_inform,
.client_unregister = pvr2_i2c_detach_inform,
@@ -685,6 +685,7 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
hdw->i2c_adap.dev.parent = &hdw->usb_dev->dev;
hdw->i2c_adap.algo = &hdw->i2c_algo;
hdw->i2c_adap.algo_data = hdw;
+ hdw->i2c_adap.class = I2C_CLASS_TV_ANALOG;
hdw->i2c_linked = !0;
i2c_set_adapdata(&hdw->i2c_adap, &hdw->v4l2_dev);
i2c_add_adapter(&hdw->i2c_adap);