i2c: i801: Remove not needed check for PCI_COMMAND_INTX_DISABLE
do_pci_enable_device() takes care that PCI_COMMAND_INTX_DISABLE is cleared if a legacy interrupt is used. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> Reviewed-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
committed by
Wolfram Sang
parent
2b3db4db66
commit
e462aa7e39
@ -1827,19 +1827,12 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
|||||||
priv->features &= ~FEATURE_IRQ;
|
priv->features &= ~FEATURE_IRQ;
|
||||||
|
|
||||||
if (priv->features & FEATURE_IRQ) {
|
if (priv->features & FEATURE_IRQ) {
|
||||||
u16 pcictl, pcists;
|
u16 pcists;
|
||||||
|
|
||||||
/* Complain if an interrupt is already pending */
|
/* Complain if an interrupt is already pending */
|
||||||
pci_read_config_word(priv->pci_dev, PCI_STATUS, &pcists);
|
pci_read_config_word(priv->pci_dev, PCI_STATUS, &pcists);
|
||||||
if (pcists & PCI_STATUS_INTERRUPT)
|
if (pcists & PCI_STATUS_INTERRUPT)
|
||||||
dev_warn(&dev->dev, "An interrupt is pending!\n");
|
dev_warn(&dev->dev, "An interrupt is pending!\n");
|
||||||
|
|
||||||
/* Check if interrupts have been disabled */
|
|
||||||
pci_read_config_word(priv->pci_dev, PCI_COMMAND, &pcictl);
|
|
||||||
if (pcictl & PCI_COMMAND_INTX_DISABLE) {
|
|
||||||
dev_info(&dev->dev, "Interrupts are disabled\n");
|
|
||||||
priv->features &= ~FEATURE_IRQ;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (priv->features & FEATURE_IRQ) {
|
if (priv->features & FEATURE_IRQ) {
|
||||||
|
Reference in New Issue
Block a user