summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2007-02-07 23:04:36 -0600
committerMike Isely <isely@pobox.com>2007-02-07 23:04:36 -0600
commit67966b941b963c8db2bdd6a59445d473c04db968 (patch)
treeb8868ad2785894f42d4dcb40efa06c28d1a30de7
parent7ffd80e0bf37ad9003d52fe6170a1b81fd224b26 (diff)
downloadmediapointer-dvb-s2-67966b941b963c8db2bdd6a59445d473c04db968.tar.gz
mediapointer-dvb-s2-67966b941b963c8db2bdd6a59445d473c04db968.tar.bz2
pvrusb2: Register I2C adapter (more) correctly
From: Mike Isely <isely@pobox.com> An I2C adapter needs to register an association with the actual parent device. Until 2.6.20, not doing this was a benign problem; now it causes an ugly warning in the system log. This 1-line patch corrects that oversight. Signed-off-by: Mike Isely <isely@pobox.com>
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 05c39d25f..215fbf473 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -1090,6 +1090,7 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
memcpy(&hdw->i2c_adap,&pvr2_i2c_adap_template,sizeof(hdw->i2c_adap));
memcpy(&hdw->i2c_algo,&pvr2_i2c_algo_template,sizeof(hdw->i2c_algo));
strlcpy(hdw->i2c_adap.name,hdw->name,sizeof(hdw->i2c_adap.name));
+ hdw->i2c_adap.dev.parent = &hdw->usb_dev->dev;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
strlcpy(hdw->i2c_algo.name,hdw->name,sizeof(hdw->i2c_algo.name));
#endif