lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (13715): [Mantis] Kernel I2C changes: use PCI parent device

Browse Source 
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Manu Abraham
2009-12-03 05:46:06 -03:00
committed by Mauro Carvalho Chehab
parent 33c79630dd
commit 8154bad4c4
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/dvb/mantis/mantis_common.h
View File

@@ -83,7 +83,7 @@ struct mantis_pci {
u8 latency; u8 latency;
struct pci_dev *pdev; struct pci_dev *pdev;
unsigned long mantis_addr; unsigned long mantis_addr;
volatile void __iomem *mantis_mmio; volatile void __iomem *mantis_mmio;

10
drivers/media/dvb/mantis/mantis_i2c.c
View File

@@ -161,11 +161,15 @@ static struct i2c_adapter mantis_i2c_adapter = {
int __devinit mantis_i2c_init(struct mantis_pci *mantis) int __devinit mantis_i2c_init(struct mantis_pci *mantis)
{ {
u32 intstat, intmask; u32 intstat, intmask;
struct i2c_adapter *i2c_adapter = &mantis->adapter;
struct pci_dev *pdev = mantis->pdev;
mutex_init(&mantis->i2c_lock); mutex_init(&mantis->i2c_lock);
memcpy(&mantis->adapter, &mantis_i2c_adapter, sizeof (mantis_i2c_adapter)); memcpy(i2c_adapter, &mantis_i2c_adapter, sizeof (mantis_i2c_adapter));
i2c_set_adapdata(&mantis->adapter, mantis); i2c_set_adapdata(i2c_adapter, mantis);
mantis->i2c_rc = i2c_add_adapter(&mantis->adapter);
i2c_adapter->dev.parent = &pdev->dev;
mantis->i2c_rc = i2c_add_adapter(i2c_adapter);
if (mantis->i2c_rc < 0) if (mantis->i2c_rc < 0)
return mantis->i2c_rc; return mantis->i2c_rc;