---

yaml --- r: 179453 b: refs/heads/master c: 8154bad h: refs/heads/master i: 179451: 9526b25 v: v3
git-mirror · Jan 17, 2010 · 4ded0f2 · 4ded0f2
1 parent 861fe04
commit 4ded0f2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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;