X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc64%2Fkernel%2Fiommu.c;h=d5d64d1d725848f8e520716b9a8df6ec1c6c730e;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=fb321026ea7242e852b71a0b3fa1df3f850df6f0;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/arch/ppc64/kernel/iommu.c b/arch/ppc64/kernel/iommu.c
index fb321026e..d5d64d1d7 100644
--- a/arch/ppc64/kernel/iommu.c
+++ b/arch/ppc64/kernel/iommu.c
@@ -229,7 +229,7 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl,
 		struct scatterlist *sglist, int nelems,
 		enum dma_data_direction direction)
 {
-	dma_addr_t dma_next, dma_addr;
+	dma_addr_t dma_next = 0, dma_addr;
 	unsigned long flags;
 	struct scatterlist *s, *outs, *segstart;
 	int outcount;
@@ -491,7 +491,7 @@ void *iommu_alloc_consistent(struct iommu_table *tbl, size_t size,
 	 */
 	if (order >= IOMAP_MAX_ORDER) {
 		printk("iommu_alloc_consistent size too large: 0x%lx\n", size);
-		return (void *)DMA_ERROR_CODE;
+		return NULL;
 	}
 
 	if (!tbl)