projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
adef477
)
ioat: fix infinite timeout checking in ioat2_quiesce
author
Dan Williams
<dan.j.williams@intel.com>
Wed, 13 Jan 2010 20:33:12 +0000
(13:33 -0700)
committer
Dan Williams
<dan.j.williams@intel.com>
Wed, 3 Feb 2010 05:57:34 +0000
(22:57 -0700)
Fix typo in ioat2_quiesce. check 'tmo' is zero, not 'end'. Also applies
to 2.6.32.3
Cc: <stable@kernel.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
drivers/dma/ioat/dma_v2.c
patch
|
blob
|
history
diff --git
a/drivers/dma/ioat/dma_v2.c
b/drivers/dma/ioat/dma_v2.c
index
5f7a500
..
5cc37af
100644
(file)
--- a/
drivers/dma/ioat/dma_v2.c
+++ b/
drivers/dma/ioat/dma_v2.c
@@
-249,7
+249,7
@@
int ioat2_quiesce(struct ioat_chan_common *chan, unsigned long tmo)
if (is_ioat_active(status) || is_ioat_idle(status))
ioat_suspend(chan);
while (is_ioat_active(status) || is_ioat_idle(status)) {
- if (
end
&& time_after(jiffies, end)) {
+ if (
tmo
&& time_after(jiffies, end)) {
err = -ETIMEDOUT;
break;
}