From ea239c9d529eddfef25655d33edbbeecca7864ba Mon Sep 17 00:00:00 2001
From: Alex Williamson <alex.williamson@hp.com>
Date: Thu, 30 Jul 2009 16:15:18 -0600
Subject: [PATCH] --- yaml --- r: 165415 b: refs/heads/master c:
 cfc65dd57967f2e0c7b3a8b73e6d12470b1cf1c1 h: refs/heads/master i:   165413:
 42ecd059f2722edec4b09d137f348fd1b83725f1   165411:
 8941d590ee3daec5e24c208c1f0f61c1a6ae0a05   165407:
 1c8b3f4b0d21a63d0e55cf6560b6aa261944e991 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/pci-dma.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1fa64f217e48..bb431000fdc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86f4d0123b1fddb47d35b9a893f8c0b94bf89abe
+refs/heads/master: cfc65dd57967f2e0c7b3a8b73e6d12470b1cf1c1
diff --git a/trunk/arch/x86/kernel/pci-dma.c b/trunk/arch/x86/kernel/pci-dma.c
index 1a041bcf506b..ae13e34f7248 100644
--- a/trunk/arch/x86/kernel/pci-dma.c
+++ b/trunk/arch/x86/kernel/pci-dma.c
@@ -212,10 +212,8 @@ static __init int iommu_setup(char *p)
 		if (!strncmp(p, "soft", 4))
 			swiotlb = 1;
 #endif
-		if (!strncmp(p, "pt", 2)) {
+		if (!strncmp(p, "pt", 2))
 			iommu_pass_through = 1;
-			return 1;
-		}
 
 		gart_parse_options(p);