From ec13d3593320ca67df43434f791b9ff2d76680e0 Mon Sep 17 00:00:00 2001
From: Chris Wright <chrisw@sous-sol.org>
Date: Wed, 13 May 2009 15:55:52 -0700
Subject: [PATCH] --- yaml --- r: 153855 b: refs/heads/master c:
 dd7264355a203c3456dbba04db471947d3b55e7e h: refs/heads/master i:   153853:
 b33b2ba8d2d04d516c9f31b3862e789187f6ae8d   153851:
 596c96528f818f47cef72b852f20b088b43d378b   153847:
 f8eef52b7aec82732615da7b1ff060f328308c2e   153839:
 fb4be46b786c536b394950b6bc2ff0eeaeaa00e9   153823:
 12bf38e7149d6529b1898dd1a13c25f6594d807a   153791:
 569472329a1b96083985242815871a2071dc83eb   153727:
 79896b63d2c658a4784006b440c64ac36558518f   153599:
 031ff737217cc98f495183e2ac2b039a8cc148bd v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/pci/dmar.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d565438987d4..39d2ba2cdf45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c416daa98a584596df21ee2c26fac6579ee58f57
+refs/heads/master: dd7264355a203c3456dbba04db471947d3b55e7e
diff --git a/trunk/drivers/pci/dmar.c b/trunk/drivers/pci/dmar.c
index faf77a00cafe..f23460a5d106 100644
--- a/trunk/drivers/pci/dmar.c
+++ b/trunk/drivers/pci/dmar.c
@@ -1088,7 +1088,7 @@ int dmar_set_interrupt(struct intel_iommu *iommu)
 		set_irq_data(irq, NULL);
 		iommu->irq = 0;
 		destroy_irq(irq);
-		return 0;
+		return ret;
 	}
 
 	ret = request_irq(irq, dmar_fault, 0, iommu->name, iommu);