---

yaml --- r: 339157 b: refs/heads/master c: 5074b85 h: refs/heads/master i: 339155: 95bf28f v: v3
git-mirror · Nov 2, 2012 · cf105aa · cf105aa
1 parent ebc7d69
commit cf105aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6acf5a8c931da9d26c8dd77d784daaf07fa2bff0
+refs/heads/master: 5074b85bdd3a464efe7b6de2ec163f4c07696a20
diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c
@@ -3317,8 +3317,9 @@ int arch_setup_hpet_msi(unsigned int irq, unsigned int id)
 	int ret;
 
 	if (irq_remapping_enabled) {
-		if (!setup_hpet_msi_remapped(irq, id))
-			return -1;
+		ret = setup_hpet_msi_remapped(irq, id);
+		if (ret)
+			return ret;
 	}
 
 	ret = msi_compose_msg(NULL, irq, &msg, id);