diff options
author | Shannon Nelson <shannon.nelson@intel.com> | 2007-10-18 06:07:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:37:32 -0400 |
commit | dfe2299e7b35a0adfc87f04d3e725ccc508d7626 (patch) | |
tree | 5dbcd9290ebf4f4830d736df5b3324f0146bb6b0 /drivers/dma/ioat.c | |
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>
Diffstat (limited to 'drivers/dma/ioat.c')
-rw-r--r-- | drivers/dma/ioat.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/dma/ioat.c b/drivers/dma/ioat.c index 54fdeb7c4945..a45872f32d50 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) | |||
71 | switch (version) { | 71 | switch (version) { |
72 | case IOAT_VER_1_2: | 72 | case IOAT_VER_1_2: |
73 | device->dma = ioat_dma_probe(pdev, iobase); | 73 | device->dma = ioat_dma_probe(pdev, iobase); |
74 | if (ioat_dca_enabled) | 74 | if (device->dma && ioat_dca_enabled) |
75 | device->dca = ioat_dca_init(pdev, iobase); | 75 | device->dca = ioat_dca_init(pdev, iobase); |
76 | break; | 76 | break; |
77 | default: | 77 | default: |
@@ -85,17 +85,16 @@ static void ioat_shutdown_functionality(struct pci_dev *pdev) | |||
85 | { | 85 | { |
86 | struct ioat_device *device = pci_get_drvdata(pdev); | 86 | struct ioat_device *device = pci_get_drvdata(pdev); |
87 | 87 | ||
88 | if (device->dma) { | ||
89 | ioat_dma_remove(device->dma); | ||
90 | device->dma = NULL; | ||
91 | } | ||
92 | |||
93 | if (device->dca) { | 88 | if (device->dca) { |
94 | unregister_dca_provider(device->dca); | 89 | unregister_dca_provider(device->dca); |
95 | free_dca_provider(device->dca); | 90 | free_dca_provider(device->dca); |
96 | device->dca = NULL; | 91 | device->dca = NULL; |
97 | } | 92 | } |
98 | 93 | ||
94 | if (device->dma) { | ||
95 | ioat_dma_remove(device->dma); | ||
96 | device->dma = NULL; | ||
97 | } | ||
99 | } | 98 | } |
100 | 99 | ||
101 | static struct pci_driver ioat_pci_driver = { | 100 | static struct pci_driver ioat_pci_driver = { |