summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2009-03-06 22:42:40 -0600
committerMike Isely <isely@pobox.com>2009-03-06 22:42:40 -0600
commiteece3353234a98e74f8d3a93f0b6f21d1950e45d (patch)
treeb1fd528fe035b505e5fded594c4b54d93d3c2c19 /linux/drivers/media
parent0f62cc7a5dbd33059d58e9e944c6af741dcc0ce6 (diff)
downloadmediapointer-dvb-s2-eece3353234a98e74f8d3a93f0b6f21d1950e45d.tar.gz
mediapointer-dvb-s2-eece3353234a98e74f8d3a93f0b6f21d1950e45d.tar.bz2
pvrusb2: Allow sub-devices to insert correctly
From: Mike Isely <isely@pobox.com> A sub-device won't successfully attach to our I2C adapter if its class isn't set to zero. Right the class is still set to I2C_CLASS_TV_ANALOG in order to allow the old mechanism to still work. This change temporarily sets the class to zero during the interval when the sub-device attaches. This code will get removed when the old i2c layer is finally removed from the driver. 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-hdw.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 8ac5b9f11..81afb6f87 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2062,6 +2062,7 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
* and every other place where I can find examples of this, the
* "chipid" appears to just be the module name again. So here we
* just do the same thing. */
+ hdw->i2c_adap.class = 0;
if (i2ccnt == 1) {
pvr2_trace(PVR2_TRACE_INIT,
"Module ID %u:"
@@ -2079,6 +2080,7 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
fname, fname,
i2caddr);
}
+ hdw->i2c_adap.class = I2C_CLASS_TV_ANALOG;
if (!sd) {
pvr2_trace(PVR2_TRACE_ERROR_LEGS,