diff options
author | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:50 -0800 |
---|---|---|
committer | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:50 -0800 |
commit | f757b390faab6c38fe0887dc2123dcb615e21953 (patch) | |
tree | bd3a7c81a775c362693bccaf00e2cef9e07e2eea /drivers/pci/msi.c | |
parent | 443c053f51f9173042a2b45d0db7271cebe78198 (diff) | |
parent | 4c82fd0506b4cc196a375d1200361fb0c5439acd (diff) |
Merge remote-tracking branch 'drm-intel/topic/core-for-CI' into drm-tip
Diffstat (limited to 'drivers/pci/msi.c')
-rw-r--r-- | drivers/pci/msi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index d84cf30bb279..d240a3d2dfe2 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -1017,8 +1017,10 @@ static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec, if (maxvec < minvec) return -ERANGE; - if (WARN_ON_ONCE(dev->msi_enabled)) + if (dev->msi_enabled) { + pci_info(dev, "can't enable MSI, already enabled\n"); return -EINVAL; + } nvec = pci_msi_vec_count(dev); if (nvec < 0) |