From 13bace20c8868ccf226edf75aa34377043b7b9c5 Mon Sep 17 00:00:00 2001
From: Prarit Bhargava <prarit@redhat.com>
Date: Mon, 17 May 2010 14:25:14 -0400
Subject: [PATCH] --- yaml --- r: 197923 b: refs/heads/master c:
 5030718ee465c759c2a851851e79039f58b9efb3 h: refs/heads/master i:   197921:
 359c886b0553e82a280c5335835caa0c2495f03a   197919:
 4c1c99632228396d4ed913b653b68440c393f8f1 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/pci/access.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 947f32699d65..2fcb3ef57495 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee6583f6e8f8dad4a53985dbabcd7c242d66a6b6
+refs/heads/master: 5030718ee465c759c2a851851e79039f58b9efb3
diff --git a/trunk/drivers/pci/access.c b/trunk/drivers/pci/access.c
index affb83b42ebb..531bc697d800 100644
--- a/trunk/drivers/pci/access.c
+++ b/trunk/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())