2.6.8.1-mm3: nsc-ircc driver crashes on shutdown

PATCH New Petr Vandrovec 1 participant 1 message Aug 22, 2004

Share & tools

Petr Vandrovec

author

2004-08-22 15:03 UTC #0 lore raw

PATCH 1/1 2.6.8.1-mm3: nsc-ircc driver crashes on shutdown

Hi,
bk-dma-decleare-coherent-memory patch adds a requirement for dma_free_coherent
that dev cannot be NULL... But it can (nsc-ircc has no suitable dev) and as dma_alloc_coherent allows NULL dev, dma_free_coherent should allow it too IMHO.
Thanks,
Petr Vandrovec

arch/i386/kernel/pci-dma.c +1 -1

diff -urN linux/arch/i386/kernel/pci-dma.c linux/arch/i386/kernel/pci-dma.c
@@ -58,7 +58,7 @@
 void dma_free_coherent(struct device *dev, size_t size,
 			 void *vaddr, dma_addr_t dma_handle)
 {
-	struct dma_coherent_mem *mem = dev->dma_mem;
+	struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
 	int order = get_order(size);
 	
 	if (mem && vaddr >= mem->virt_base && vaddr < (mem->virt_base + (mem->size << PAGE_SHIFT))) {