aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/ioat_dma.c
diff options
context:
space:
mode:
authorShannon Nelson <shannon.nelson@intel.com>2007-10-18 06:07:13 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 17:37:32 -0400
commitdfe2299e7b35a0adfc87f04d3e725ccc508d7626 (patch)
tree5dbcd9290ebf4f4830d736df5b3324f0146bb6b0 /drivers/dma/ioat_dma.c
parent7df7cf0676060d778486359676734447347e1caf (diff)
I/OAT: clean up of dca provider start and stop
Don't start ioat_dca if ioat_dma didn't start, and then stop ioat_dca before stopping ioat_dma. Since the ioat_dma side does the pci device work, This takes care of ioat_dca trying to use a bad device reference. Signed-off-by: Shannon Nelson <shannon.nelson@intel.com> Cc: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/dma/ioat_dma.c')
-rw-r--r--drivers/dma/ioat_dma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c
index 59d4344db005..725f83f3eeb3 100644
--- a/drivers/dma/ioat_dma.c
+++ b/drivers/dma/ioat_dma.c
@@ -941,10 +941,10 @@ void ioat_dma_remove(struct ioatdma_device *device)
941 struct dma_chan *chan, *_chan; 941 struct dma_chan *chan, *_chan;
942 struct ioat_dma_chan *ioat_chan; 942 struct ioat_dma_chan *ioat_chan;
943 943
944 dma_async_device_unregister(&device->common);
945
946 ioat_dma_remove_interrupts(device); 944 ioat_dma_remove_interrupts(device);
947 945
946 dma_async_device_unregister(&device->common);
947
948 pci_pool_destroy(device->dma_pool); 948 pci_pool_destroy(device->dma_pool);
949 pci_pool_destroy(device->completion_pool); 949 pci_pool_destroy(device->completion_pool);
950 950