patch-2.1.126 linux/drivers/block/ide.c
Next file: linux/drivers/block/ide.h
Previous file: linux/drivers/block/ide-pci.c
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
Mon Oct 12 11:42:59 1998
- Orig file:
v2.1.125/linux/drivers/block/ide.c
- Orig date:
Fri Oct 9 13:27:07 1998
diff -u --recursive --new-file v2.1.125/linux/drivers/block/ide.c linux/drivers/block/ide.c
@@ -1737,6 +1737,11 @@
else
hwgroup->hwif = HWIF(hwgroup->drive);
+#ifdef CONFIG_BLK_DEV_IDEDMA
+ if (hwif->dma_base)
+ (void) ide_release_dma(hwif);
+#endif /* CONFIG_BLK_DEV_IDEDMA */
+
/*
* Remove us from the kernel's knowledge
*/
@@ -2998,8 +3003,13 @@
{
int index;
- for (index = 0; index < MAX_HWIFS; ++index)
+ for (index = 0; index < MAX_HWIFS; ++index) {
ide_unregister(index);
+#ifdef CONFIG_BLK_DEV_IDEDMA
+ if (ide_hwifs[index].dma_base)
+ (void) ide_release_dma(&ide_hwifs[index]);
+#endif /* CONFIG_BLK_DEV_IDEDMA */
+ }
#ifdef CONFIG_PROC_FS
proc_ide_destroy();
#endif
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov