Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 316354
b: refs/heads/master
c: 29b6085
h: refs/heads/master
v: v3
  • Loading branch information
Jean Delvare authored and Jean Delvare committed Jul 24, 2012
1 parent 527e103 commit 19f4bb4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 636752bcb5177a301d0266270661581de8624828
refs/heads/master: 29b608540b030d38a978c972cbe99d40efdb7267
13 changes: 9 additions & 4 deletions trunk/drivers/i2c/busses/i2c-i801.c
Original file line number Diff line number Diff line change
Expand Up @@ -863,8 +863,14 @@ static int __devinit i801_probe(struct pci_dev *dev,
break;
}

/* IRQ processing only tested on CougarPoint PCH */
if (dev->device == PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS)
/* IRQ processing tested on CougarPoint PCH, ICH5, ICH7-M and ICH10 */
if (dev->device == PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS ||
dev->device == PCI_DEVICE_ID_INTEL_82801EB_3 ||
dev->device == PCI_DEVICE_ID_INTEL_ICH7_17 ||
dev->device == PCI_DEVICE_ID_INTEL_ICH8_5 ||
dev->device == PCI_DEVICE_ID_INTEL_ICH9_6 ||
dev->device == PCI_DEVICE_ID_INTEL_ICH10_4 ||
dev->device == PCI_DEVICE_ID_INTEL_ICH10_5)
priv->features |= FEATURE_IRQ;

/* Disable features on user request */
Expand Down Expand Up @@ -918,8 +924,6 @@ static int __devinit i801_probe(struct pci_dev *dev,
dev_dbg(&dev->dev, "SMBus using interrupt SMI#\n");
/* Disable SMBus interrupt feature if SMBus using SMI# */
priv->features &= ~FEATURE_IRQ;
} else {
dev_dbg(&dev->dev, "SMBus using PCI Interrupt\n");
}

/* Clear special mode bits */
Expand All @@ -937,6 +941,7 @@ static int __devinit i801_probe(struct pci_dev *dev,
dev->irq, err);
goto exit_release;
}
dev_info(&dev->dev, "SMBus using PCI Interrupt\n");
}

/* set up the sysfs linkage to our parent device */
Expand Down

0 comments on commit 19f4bb4

Please sign in to comment.