Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

[~andy/linux] / drivers / pci / pci-driver.c

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 12d1e81a8abecd2fc1a6bc7ab3946d53df05542a..3623d65f8b86ccb9d786085ec57592d2e890292c 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -604,7 +604,8 @@ static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev)
         * supported as well.  Drivers are supposed to support either the
         * former, or the latter, but not both at the same time.
         */
-       WARN_ON(ret && drv->driver.pm);
+       WARN(ret && drv->driver.pm, "driver %s device %04x:%04x\n",
+               drv->name, pci_dev->vendor, pci_dev->device);
 
        return ret;
 }