@@ -535,4 +535,7 @@ extern void pasemi_dma_free_fun(int fun);
/* Initialize the library, must be called before any other functions */
extern int pasemi_dma_init(void);
+/* Clean up the library */
+extern void pasemi_dma_exit(void);
+
#endif /* ASM_PASEMI_DMA_H */
@@ -534,14 +534,17 @@ int pasemi_dma_init(void)
err = -ENODEV;
goto out;
}
+
iob_regs = map_onedev(iob_pdev, 0);
+ if (iob_regs == NULL)
+ printk(KERN_WARNING "pasemi_dma_init: Can't ioremap I/O Bridge registers\n");
dma_pdev = pci_get_device(PCI_VENDOR_ID_PASEMI, 0xa007, NULL);
if (!dma_pdev) {
BUG();
printk(KERN_WARNING "Can't find DMA controller\n");
err = -ENODEV;
- goto out;
+ goto out_unmap;
}
dma_regs = map_onedev(dma_pdev, 0);
base_hw_irq = virq_to_hw(dma_pdev->irq);
@@ -624,9 +627,19 @@ int pasemi_dma_init(void)
printk(KERN_INFO "PA Semi PWRficient DMA library initialized "
"(%d tx, %d rx channels)\n", num_txch, num_rxch);
+ goto out;
+
+out_unmap:
+ iounmap(iob_regs);
out:
spin_unlock(&init_lock);
return err;
}
EXPORT_SYMBOL(pasemi_dma_init);
+
+void pasemi_dma_exit(void)
+{
+ iounmap(iob_regs);
+}
+
@@ -1919,7 +1919,11 @@ int pasemi_mac_init_module(void)
if (err)
return err;
- return pci_register_driver(&pasemi_mac_driver);
+ err = pci_register_driver(&pasemi_mac_driver);
+ if (err)
+ pasemi_dma_exit();
+
+ return err;
}
module_init(pasemi_mac_init_module);