diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 12:53:03 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 12:53:03 -0200 |
| commit | a10fafffd600af5d428876815d7da534e3a4c824 (patch) | |
| tree | 417bcfacf63f442fbd9387af018173288ee0b156 /linux/drivers/media/dvb | |
| parent | b53eb55ff0f73052682018efc8974bcbc7f6aec1 (diff) | |
| download | mediapointer-dvb-s2-a10fafffd600af5d428876815d7da534e3a4c824.tar.gz mediapointer-dvb-s2-a10fafffd600af5d428876815d7da534e3a4c824.tar.bz2 | |
backport changeset 12a917f69d1468c91d646dbad8408dd0d39d6207
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Backport changeset from Jean Delvare <khali@linux-fr.org> that declare
i2c_adapter parent devices.
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/b2c2/flexcop-i2c.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-i2c.c b/linux/drivers/media/dvb/b2c2/flexcop-i2c.c index e0bd2d8f0..5347a406f 100644 --- a/linux/drivers/media/dvb/b2c2/flexcop-i2c.c +++ b/linux/drivers/media/dvb/b2c2/flexcop-i2c.c @@ -190,6 +190,7 @@ int flexcop_i2c_init(struct flexcop_device *fc) fc->i2c_adap.class = I2C_CLASS_TV_DIGITAL; fc->i2c_adap.algo = &flexcop_algo; fc->i2c_adap.algo_data = NULL; + fc->i2c_adap.dev.parent = fc->dev; if ((ret = i2c_add_adapter(&fc->i2c_adap)) < 0) return ret; diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c index 55ba02038..70df31b0a 100644 --- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c +++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c @@ -27,6 +27,7 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d) #endif d->i2c_adap.algo = d->props.i2c_algo; d->i2c_adap.algo_data = NULL; + d->i2c_adap.dev.parent = &d->udev->dev; i2c_set_adapdata(&d->i2c_adap, d); diff --git a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index 239a48bcb..27c558559 100644 --- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c @@ -1702,6 +1702,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i #endif ttusb->i2c_adap.algo = &ttusb_dec_algo; ttusb->i2c_adap.algo_data = NULL; + ttusb->i2c_adap.dev.parent = &udev->dev; result = i2c_add_adapter(&ttusb->i2c_adap); if (result) { |