aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/dma/ioatdma.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
index b3fca1200a73..c4209af4fde4 100644
--- a/drivers/dma/ioatdma.c
+++ b/drivers/dma/ioatdma.c
@@ -41,6 +41,7 @@
41 41
42/* internal functions */ 42/* internal functions */
43static int __devinit ioat_probe(struct pci_dev *pdev, const struct pci_device_id *ent); 43static int __devinit ioat_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
44static void ioat_shutdown(struct pci_dev *pdev);
44static void __devexit ioat_remove(struct pci_dev *pdev); 45static void __devexit ioat_remove(struct pci_dev *pdev);
45 46
46static int enumerate_dma_channels(struct ioat_device *device) 47static int enumerate_dma_channels(struct ioat_device *device)
@@ -557,6 +558,7 @@ static struct pci_driver ioat_pci_driver = {
557 .name = "ioatdma", 558 .name = "ioatdma",
558 .id_table = ioat_pci_tbl, 559 .id_table = ioat_pci_tbl,
559 .probe = ioat_probe, 560 .probe = ioat_probe,
561 .shutdown = ioat_shutdown,
560 .remove = __devexit_p(ioat_remove), 562 .remove = __devexit_p(ioat_remove),
561}; 563};
562 564
@@ -781,9 +783,20 @@ err_request_regions:
781err_set_dma_mask: 783err_set_dma_mask:
782 pci_disable_device(pdev); 784 pci_disable_device(pdev);
783err_enable_device: 785err_enable_device:
786
787 printk(KERN_ERR "Intel(R) I/OAT DMA Engine initialization failed\n");
788
784 return err; 789 return err;
785} 790}
786 791
792static void ioat_shutdown(struct pci_dev *pdev)
793{
794 struct ioat_device *device;
795 device = pci_get_drvdata(pdev);
796
797 dma_async_device_unregister(&device->common);
798}
799
787static void __devexit ioat_remove(struct pci_dev *pdev) 800static void __devexit ioat_remove(struct pci_dev *pdev)
788{ 801{
789 struct ioat_device *device; 802 struct ioat_device *device;