patch-2.4.14 linux/arch/alpha/kernel/pci_iommu.c

• Lines: 27
• Date: Mon Nov 5 09:47:41 2001
• Orig file: v2.4.13/linux/arch/alpha/kernel/pci_iommu.c
• Orig date: Tue Oct 23 22:48:49 2001

diff -u --recursive --new-file v2.4.13/linux/arch/alpha/kernel/pci_iommu.c linux/arch/alpha/kernel/pci_iommu.c
@@ -250,7 +250,7 @@
 	if (dir == PCI_DMA_NONE)
 		BUG();
 	return pci_map_single_1(pdev, cpu_addr, size,
-			        (pdev->dma_mask >> 32) != 0);
+				pdev ? (pdev->dma_mask >> 32) != 0 : 0);
 }
 
 dma_addr_t
@@ -260,7 +260,7 @@
 	if (dir == PCI_DMA_NONE)
 		BUG();
 	return pci_map_single_1(pdev, (char *)page_address(page) + offset,
-			        size, (pdev->dma_mask >> 32) != 0);
+			        size, pdev ? (pdev->dma_mask >> 32) != 0 : 0);
 }
 
 /* Unmap a single streaming mode DMA translation.  The DMA_ADDR and
@@ -304,7 +304,7 @@
 	dma_ofs = (dma_addr - arena->dma_base) >> PAGE_SHIFT;
 	if (dma_ofs * PAGE_SIZE >= arena->size) {
 		printk(KERN_ERR "Bogus pci_unmap_single: dma_addr %lx "
-		       " base %x size %x\n", dma_addr, arena->dma_base,
+		       " base %lx size %x\n", dma_addr, arena->dma_base,
 		       arena->size);
 		return;
 		BUG();