diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-01-13 13:33:12 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-23 07:37:49 -0800 |
| commit | 27df9c09dd64b05f862d5a05cfb1b1e479a44f0c (patch) | |
| tree | b557f67eb83d46f16448201eb7dfd9d82cf887bd | |
| parent | 2b8fcd4ed0db58421d1600ff6e3b01dd68b3ef83 (diff) | |
| download | linux-ak78xx-27df9c09dd64b05f862d5a05cfb1b1e479a44f0c.tar.gz | |
ioat: fix infinite timeout checking in ioat2_quiesce
commit 7e55a70c5b9a57c12f49c44b0847c9343d4f54e4 upstream.
Fix typo in ioat2_quiesce. check 'tmo' is zero, not 'end'. Also applies
to 2.6.32.3
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/dma/ioat/dma_v2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ioat/dma_v2.c b/drivers/dma/ioat/dma_v2.c index 5f7a500e18d..5cc37afe2bc 100644 --- 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; } |