vserver 1.9.3

[linux-2.6.git] / arch / ppc64 / kernel / iommu.c

diff --git a/arch/ppc64/kernel/iommu.c b/arch/ppc64/kernel/iommu.c
index fb32102..d5d64d1 100644 (file)
--- 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)