Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197923
b: refs/heads/master
c: 5030718
h: refs/heads/master
i:
  197921: 359c886
  197919: 4c1c996
v: v3
  • Loading branch information
Prarit Bhargava authored and Jesse Barnes committed May 18, 2010
1 parent d8de412 commit 13bace2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ee6583f6e8f8dad4a53985dbabcd7c242d66a6b6
refs/heads/master: 5030718ee465c759c2a851851e79039f58b9efb3
7 changes: 6 additions & 1 deletion trunk/drivers/pci/access.c
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit 13bace2

Please sign in to comment.