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

[karo-tx-linux.git] / drivers / pci / access.c

diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index affb83b42ebb9c2ea8e43fc6bf88970bbfd0d230..531bc697d800910087d8ff2f125a00c03dd4abc9 100644 (file)
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -220,8 +220,13 @@ static int pci_vpd_pci22_wait(struct pci_dev *dev)
                        return 0;
                }
 
-               if (time_after(jiffies, timeout))
+               if (time_after(jiffies, timeout)) {
+                       dev_printk(KERN_DEBUG, &dev->dev,
+                                  "vpd r/w failed.  This is likely a firmware "
+                                  "bug on this device.  Contact the card "
+                                  "vendor for a firmware update.");
                        return -ETIMEDOUT;
+               }
                if (fatal_signal_pending(current))
                        return -EINTR;
                if (!cond_resched())