From ce30c41c47bc8c8baeabc165c13ffee55c3e56b3 Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Date: Fri, 26 Aug 2011 12:20:59 +0100
Subject: [PATCH] --- yaml --- r: 263383 b: refs/heads/master c:
 a94cc4e6c0a26a7c8f79a432ab2c89534aa674d5 h: refs/heads/master i:   263381:
 5e3b9f57b77ac327824ebc30e7535f4f57bce67f   263379:
 e81f506f2290c43284a58364834eac601e72d3e8   263375:
 17e6b5ce63267f55efe247dc8c83b1f7d19edefb v: v3

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

diff --git a/[refs] b/[refs]
index 6d5aa7b302d7..c4a7cdd92951 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e8d4e8be2e104514564983239af9dd9521c7779
+refs/heads/master: a94cc4e6c0a26a7c8f79a432ab2c89534aa674d5
diff --git a/trunk/arch/x86/platform/mrst/mrst.c b/trunk/arch/x86/platform/mrst/mrst.c
index 7000e74b3087..58425adc22c6 100644
--- a/trunk/arch/x86/platform/mrst/mrst.c
+++ b/trunk/arch/x86/platform/mrst/mrst.c
@@ -689,7 +689,9 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)
 			irq_attr.trigger = 1;
 			irq_attr.polarity = 1;
 			io_apic_set_pci_routing(NULL, pentry->irq, &irq_attr);
-		}
+		} else
+			pentry->irq = 0; /* No irq */
+
 		switch (pentry->type) {
 		case SFI_DEV_TYPE_IPC:
 			/* ID as IRQ is a hack that will go away */