[PATCH] SCSI on non-ISA systems

From: Geert Uytterhoeven (geert@linux-m68k.org)
Date: Fri Nov 08 2002 - 08:46:40 EST

Since 2.5.31, the compilation of kernel/dma.c is conditional on
CONFIG_GENERIC_ISA_DMA. However, drivers/scsi/hosts.c unconditionally calls
free_dma(), which breaks machines with SCSI that don't have ISA.

Please apply!

--- linux-2.5.46/drivers/scsi/hosts.c Thu Oct 31 10:15:33 2002
+++ linux-m68k-2.5.46/drivers/scsi/hosts.c Fri Nov 8 14:27:59 2002
@@ -27,6 +27,7 @@
  * hosts currently present in the system.
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/blk.h>
 #include <linux/kernel.h>
@@ -98,8 +99,10 @@
 {
         if (shost->irq)
                 free_irq(shost->irq, NULL);
+#ifdef CONFIG_GENERIC_ISA_DMA
         if (shost->dma_channel != 0xff)
                 free_dma(shost->dma_channel);
+#endif
         if (shost->io_port && shost->n_io_port)
                 release_region(shost->io_port, shost->n_io_port);
 }

Gr{oetje,eeting}s,

                                                Geert 

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Fri Nov 15 2002 - 22:00:15 EST