diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-04-30 03:44:54 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-30 11:49:19 -0400 |
commit | e5f66eafe5a4c678965a2138b92b645c2c0c4d10 (patch) | |
tree | cdeb95f80df8b5f282d5c5301f59f455664ea44e | |
parent | ab86e974f04b1cd827a9c7c35273834ebcd9ab38 (diff) |
PCI: Set ->mask_pos correctly
The "+" operation has higher precedence than "?:" and ->msi_cap is
always non-zero here so the original statement is equivalent to:
entry->mask_pos = PCI_MSI_MASK_64;
Which wasn't the intent.
[bhelgaas: my fault from 78b5a310ce]
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r-- | drivers/pci/msi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index d40bed726769..2c1075213bec 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c | |||
@@ -563,8 +563,10 @@ static int msi_capability_init(struct pci_dev *dev, int nvec) | |||
563 | entry->msi_attrib.default_irq = dev->irq; /* Save IOAPIC IRQ */ | 563 | entry->msi_attrib.default_irq = dev->irq; /* Save IOAPIC IRQ */ |
564 | entry->msi_attrib.pos = dev->msi_cap; | 564 | entry->msi_attrib.pos = dev->msi_cap; |
565 | 565 | ||
566 | entry->mask_pos = dev->msi_cap + (control & PCI_MSI_FLAGS_64BIT) ? | 566 | if (control & PCI_MSI_FLAGS_64BIT) |
567 | PCI_MSI_MASK_64 : PCI_MSI_MASK_32; | 567 | entry->mask_pos = dev->msi_cap + PCI_MSI_MASK_64; |
568 | else | ||
569 | entry->mask_pos = dev->msi_cap + PCI_MSI_MASK_32; | ||
568 | /* All MSIs are unmasked by default, Mask them all */ | 570 | /* All MSIs are unmasked by default, Mask them all */ |
569 | if (entry->msi_attrib.maskbit) | 571 | if (entry->msi_attrib.maskbit) |
570 | pci_read_config_dword(dev, entry->mask_pos, &entry->masked); | 572 | pci_read_config_dword(dev, entry->mask_pos, &entry->masked); |