patch-2.1.115 linux/drivers/sbus/dvma.c

Next file: linux/drivers/sbus/sbus.c
Previous file: linux/drivers/sbus/char/zs.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.114/linux/drivers/sbus/dvma.c linux/drivers/sbus/dvma.c
@@ -137,6 +137,7 @@
 	struct Linux_SBus_DMA *dma;
 	struct Linux_SBus_DMA *dchain;
 
+	if(sun4_dma_physaddr) {
 	dma = kmalloc(sizeof(struct Linux_SBus_DMA), GFP_ATOMIC);
 
 	/* No SBUS */
@@ -146,13 +147,16 @@
 	dma_chain=dma;
 
 	dma->regs = (struct sparc_dma_registers *)
-		sparc_alloc_io (SUN4_300_DMA_PHYSADDR, 0,
+		sparc_alloc_io (sun4_dma_physaddr, 0,
 				PAGE_SIZE, "dma", 0x0, 0x0);
 
 	/* No prom node */
 	dma->node = 0x0;
 
 	init_one_dvma(dma, 0);
+	} else {
+	  dma_chain=0x0;
+	}
 }
 
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov