summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2008-01-31 17:50:02 -0600
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-01 21:03:36 +1100
commit2da53b0134ad41b91556d2d2a322cc03487a1ab7 (patch)
treea2dbec136864c02f7b7113fef77f3f09d437a29e
parent0c6377f878eb767846934d6c70377afac9a4db68 (diff)
downloadop-kernel-dev-2da53b0134ad41b91556d2d2a322cc03487a1ab7.zip
op-kernel-dev-2da53b0134ad41b91556d2d2a322cc03487a1ab7.tar.gz
pasemi: Fix thinko in dma_direct_ops setup
[POWERPC] pasemi: Fix thinko in dma_direct_ops setup The first patch will just fall through and still set dma_data to a bad value, make it return directly instead. Signed-off-by: Olof Johansson <olof@lixom.net> Acked-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/powerpc/platforms/pasemi/iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
index c5cfd4b..5803f11 100644
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -184,7 +184,7 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev)
if (dev->vendor == 0x1959 && dev->device == 0xa007 &&
!firmware_has_feature(FW_FEATURE_LPAR)) {
dev->dev.archdata.dma_ops = &dma_direct_ops;
- dev->dev.archdata.dma_data = 0;
+ return;
}
#endif
OpenPOWER on IntegriCloud