diff options
| author | Shannon Nelson <shannon.nelson@intel.com> | 2007-10-18 03:07:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 14:37:32 -0700 |
| commit | dfe2299e7b35a0adfc87f04d3e725ccc508d7626 (patch) | |
| tree | 5dbcd9290ebf4f4830d736df5b3324f0146bb6b0 | |
| parent | 7df7cf0676060d778486359676734447347e1caf (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>
| -rw-r--r-- | drivers/dma/ioat.c | 11 | ||||
| -rw-r--r-- | drivers/dma/ioat_dma.c | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/drivers/dma/ioat.c b/drivers/dma/ioat.c index 54fdeb7c494..a45872f32d5 100644 --- a/drivers/dma/ioat.c +++ b/drivers/dma/ioat.c @@ -71,7 +71,7 @@ static int ioat_setup_functionality(struct pci_dev *pdev, void __iomem *iobase) switch (version) { case IOAT_VER_1_2: device->dma = ioat_dma_probe(pdev, iobase); - if (ioat_dca_enabled) + if (device->dma && ioat_dca_enabled) device->dca = ioat_dca_init(pdev, iobase); break; default: @@ -85,17 +85,16 @@ static void ioat_shutdown_functionality(struct pci_dev *pdev) { struct ioat_device *device = pci_get_drvdata(pdev); - if (device->dma) { - ioat_dma_remove(device->dma); - device->dma = NULL; - } - if (device->dca) { unregister_dca_provider(device->dca); free_dca_provider(device->dca); device->dca = NULL; } + if (device->dma) { + ioat_dma_remove(device->dma); + device->dma = NULL; + } } static struct pci_driver ioat_pci_driver = { diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c index 59d4344db00..725f83f3eeb 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) struct dma_chan *chan, *_chan; struct ioat_dma_chan *ioat_chan; - dma_async_device_unregister(&device->common); - ioat_dma_remove_interrupts(device); + dma_async_device_unregister(&device->common); + pci_pool_destroy(device->dma_pool); pci_pool_destroy(device->completion_pool); |