From 4ded0f26cec7e7b86d512da4c0f087cb4da9f3e4 Mon Sep 17 00:00:00 2001 From: Manu Abraham Date: Thu, 3 Dec 2009 05:46:06 -0300 Subject: [PATCH] --- yaml --- r: 179453 b: refs/heads/master c: 8154bad4c488c1a23fb504a6e751d71a39733b76 h: refs/heads/master i: 179451: 9526b2544254b64c17df86e2260205b0aeb2181b v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/mantis/mantis_common.h | 2 +- trunk/drivers/media/dvb/mantis/mantis_i2c.c | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ed2eb8a6647d..7f22f8c4c5ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33c79630dd9fb7658dbb885a22e3a8127b16a38a +refs/heads/master: 8154bad4c488c1a23fb504a6e751d71a39733b76 diff --git a/trunk/drivers/media/dvb/mantis/mantis_common.h b/trunk/drivers/media/dvb/mantis/mantis_common.h index d4865e4f3468..34d2389f312b 100644 --- a/trunk/drivers/media/dvb/mantis/mantis_common.h +++ b/trunk/drivers/media/dvb/mantis/mantis_common.h @@ -83,7 +83,7 @@ struct mantis_pci { u8 latency; - struct pci_dev *pdev; + struct pci_dev *pdev; unsigned long mantis_addr; volatile void __iomem *mantis_mmio; diff --git a/trunk/drivers/media/dvb/mantis/mantis_i2c.c b/trunk/drivers/media/dvb/mantis/mantis_i2c.c index 39fabe572c2e..005df1e90a16 100644 --- a/trunk/drivers/media/dvb/mantis/mantis_i2c.c +++ b/trunk/drivers/media/dvb/mantis/mantis_i2c.c @@ -161,11 +161,15 @@ static struct i2c_adapter mantis_i2c_adapter = { int __devinit mantis_i2c_init(struct mantis_pci *mantis) { u32 intstat, intmask; + struct i2c_adapter *i2c_adapter = &mantis->adapter; + struct pci_dev *pdev = mantis->pdev; mutex_init(&mantis->i2c_lock); - memcpy(&mantis->adapter, &mantis_i2c_adapter, sizeof (mantis_i2c_adapter)); - i2c_set_adapdata(&mantis->adapter, mantis); - mantis->i2c_rc = i2c_add_adapter(&mantis->adapter); + memcpy(i2c_adapter, &mantis_i2c_adapter, sizeof (mantis_i2c_adapter)); + i2c_set_adapdata(i2c_adapter, mantis); + + i2c_adapter->dev.parent = &pdev->dev; + mantis->i2c_rc = i2c_add_adapter(i2c_adapter); if (mantis->i2c_rc < 0) return mantis->i2c_rc;