58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
From 229bcc82455f75e57609caab078bba2b94c4db4e Mon Sep 17 00:00:00 2001
|
|
From: Manu Abraham <abraham.manu@gmail.com>
|
|
Date: Thu, 3 Dec 2009 05:46:06 -0300
|
|
Subject: [PATCH 017/120] V4L/DVB (13715): [Mantis] Kernel I2C changes: use PCI parent device
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Manu Abraham <manu@linuxtv.org>
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
(cherry picked from commit 8154bad4c488c1a23fb504a6e751d71a39733b76)
|
|
|
|
Signed-off-by: Bjørn Mork <bjorn@mork.no>
|
|
---
|
|
drivers/media/dvb/mantis/mantis_common.h | 2 +-
|
|
drivers/media/dvb/mantis/mantis_i2c.c | 10 +++++++---
|
|
2 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
|
|
index d4865e4..34d2389 100644
|
|
--- a/drivers/media/dvb/mantis/mantis_common.h
|
|
+++ b/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/drivers/media/dvb/mantis/mantis_i2c.c b/drivers/media/dvb/mantis/mantis_i2c.c
|
|
index 39fabe5..005df1e 100644
|
|
--- a/drivers/media/dvb/mantis/mantis_i2c.c
|
|
+++ b/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;
|
|
|
|
--
|
|
1.7.1
|
|
|