1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index d5f90d6383bc..604265c40853 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -831,7 +831,7 @@ int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec)
         int status, maxvec;
         u16 msgctl;
 
-        if (!dev->msi_cap)
+        if (!dev->msi_cap || dev->current_state != PCI_D0)
                 return -EINVAL;
 
         pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &msgctl);
@@ -862,7 +862,7 @@ int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec)
         int ret, nvec;
         u16 msgctl;
 
-        if (!dev->msi_cap)
+        if (!dev->msi_cap || dev->current_state != PCI_D0)
                 return -EINVAL;
 
         pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &msgctl);
@@ -955,7 +955,7 @@ int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
         int status, nr_entries;
         int i, j;
 
-        if (!entries || !dev->msix_cap)
+        if (!entries || !dev->msix_cap || dev->current_state != PCI_D0)
                 return -EINVAL;
 
         status = pci_msi_check_device(dev, nvec, PCI_CAP_ID_MSIX);