X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc64%2Fkernel%2FpSeries_iommu.c;h=367da0eb5b51d607a1ebcb0fe5b75b8befb56964;hb=3e3ff47c8527c5ba0be4e9f358d49e4b076bd6ef;hp=91749173f948eb87f03be6a5dc47e76759084d4a;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/arch/ppc64/kernel/pSeries_iommu.c b/arch/ppc64/kernel/pSeries_iommu.c
index 91749173f..367da0eb5 100644
--- a/arch/ppc64/kernel/pSeries_iommu.c
+++ b/arch/ppc64/kernel/pSeries_iommu.c
@@ -147,7 +147,7 @@ static void iommu_buses_init_lpar(struct list_head *bus_list)
 		bus = pci_bus_b(ln);
 		busdn = PCI_GET_DN(bus);
 
-		dma_window = (unsigned int *)get_property(busdn, "ibm,dma-window", NULL);
+		dma_window = (unsigned int *)get_property(busdn, "ibm,dma-window", 0);
 		if (dma_window) {
 			/* Bussubno hasn't been copied yet.
 			 * Do it now because iommu_table_setparms_lpar needs it.
@@ -231,7 +231,7 @@ static void iommu_table_setparms_lpar(struct pci_controller *phb,
 {
 	unsigned int *dma_window;
 
-	dma_window = (unsigned int *)get_property(dn, "ibm,dma-window", NULL);
+	dma_window = (unsigned int *)get_property(dn, "ibm,dma-window", 0);
 
 	if (!dma_window)
 		panic("iommu_table_setparms_lpar: device %s has no"