summaryrefslogtreecommitdiff
path: root/drivers/dma
diff options
context:
space:
mode:
authorMaciej Sosnowski <maciej.sosnowski@intel.com>2009-02-26 11:05:07 +0100
committerDan Williams <dan.j.williams@intel.com>2009-03-04 16:04:40 -0700
commit2b8a6bf896ef47cc7d84c503079cc7b99789f9fa (patch)
tree2c742bd8b7343d0e57abc7b11fce62d914886228 /drivers/dma
parent8b794b141c633083408d0bfb2229b3406d0ebf99 (diff)
downloadlinux-3.10-2b8a6bf896ef47cc7d84c503079cc7b99789f9fa.tar.gz
linux-3.10-2b8a6bf896ef47cc7d84c503079cc7b99789f9fa.tar.bz2
linux-3.10-2b8a6bf896ef47cc7d84c503079cc7b99789f9fa.zip
I/OAT: cancel watchdog before dma remove
Channel watchdog should be canceled before the rest of dma remove stuff. Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com> Signed-off-by: Shannon Nelson <shannon.nelson@intel.com> Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/ioat_dma.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c
index 9012da7908f..fc9b845ee89 100644
--- a/drivers/dma/ioat_dma.c
+++ b/drivers/dma/ioat_dma.c
@@ -1705,6 +1705,9 @@ void ioat_dma_remove(struct ioatdma_device *device)
struct dma_chan *chan, *_chan;
struct ioat_dma_chan *ioat_chan;
+ if (device->version != IOAT_VER_3_0)
+ cancel_delayed_work(&device->work);
+
ioat_dma_remove_interrupts(device);
dma_async_device_unregister(&device->common);
@@ -1716,10 +1719,6 @@ void ioat_dma_remove(struct ioatdma_device *device)
pci_release_regions(device->pdev);
pci_disable_device(device->pdev);
- if (device->version != IOAT_VER_3_0) {
- cancel_delayed_work(&device->work);
- }
-
list_for_each_entry_safe(chan, _chan,
&device->common.channels, device_node) {
ioat_chan = to_ioat_chan(chan);