From: Olof Johansson Date: Thu, 31 Jan 2008 06:41:30 +0000 (-0600) Subject: POWERPC: Set dma_data correctly for direct_ops on pasemi X-Git-Tag: v2.6.25-rc1~1130 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24af8cb86973dde9bf8df51bef923fda8718bdb5;p=linux-2.6 POWERPC: Set dma_data correctly for direct_ops on pasemi More late-caught fallout from the mainline merge. Commit 35e4a6e26d0c6bc7f32087db61f0fb3666531183 ("[POWERPC] Use archdata.dma_data in dma_direct_ops and add the offset") claimed "Now that all platforms using dma_direct_offset setup the archdata.dma_data correctly, ..." ..but nope -- the pasemi iommu setup code that disables translation on the DMA pci device didn't set dma_data correctly. This fixes it. Signed-off-by: Olof Johansson Signed-off-by: Linus Torvalds --- diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c index 9916a0f3e4..c5cfd4b04a 100644 --- a/arch/powerpc/platforms/pasemi/iommu.c +++ b/arch/powerpc/platforms/pasemi/iommu.c @@ -182,8 +182,10 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev) * CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE at build time. */ if (dev->vendor == 0x1959 && dev->device == 0xa007 && - !firmware_has_feature(FW_FEATURE_LPAR)) + !firmware_has_feature(FW_FEATURE_LPAR)) { dev->dev.archdata.dma_ops = &dma_direct_ops; + dev->dev.archdata.dma_data = 0; + } #endif dev->dev.archdata.dma_data = &iommu_table_iobmap;