From 115691b8f6f352b2131c8dcd34e63f596942ab48 Mon Sep 17 00:00:00 2001 From: Rajesh Shah Date: Tue, 23 May 2006 10:14:36 -0700 Subject: [PATCH] --- yaml --- r: 28588 b: refs/heads/master c: 020d502488bebdbc1b2c2828d996f04e563f082a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/msi.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9d8553a0afd4..ea5bf7e44817 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1edab4a164b229807853682f7ff7858c11dd3481 +refs/heads/master: 020d502488bebdbc1b2c2828d996f04e563f082a diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c index 4aea563bda60..9c69b6966e79 100644 --- a/trunk/drivers/pci/msi.c +++ b/trunk/drivers/pci/msi.c @@ -940,14 +940,13 @@ int pci_enable_msi(struct pci_dev* dev) if (!pos) return -EINVAL; - pci_read_config_word(dev, msi_control_reg(pos), &control); - if (control & PCI_MSI_FLAGS_ENABLE) - return 0; /* Already in MSI mode */ - if (!msi_lookup_vector(dev, PCI_CAP_ID_MSI)) { /* Lookup Sucess */ unsigned long flags; + pci_read_config_word(dev, msi_control_reg(pos), &control); + if (control & PCI_MSI_FLAGS_ENABLE) + return 0; /* Already in MSI mode */ spin_lock_irqsave(&msi_lock, flags); if (!vector_irq[dev->irq]) { msi_desc[dev->irq]->msi_attrib.state = 0;