---

yaml --- r: 197883 b: refs/heads/master c: 5715f0f h: refs/heads/master i: 197881: a6a9cbd 197879: 6e9eb17 v: v3
git-mirror · Apr 9, 2010 · eec6a52 · eec6a52
1 parent 7430079
commit eec6a52
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: 78d5f0f500e6ba8f6cfd0673475ff4d941d705a2
+refs/heads/master: 5715f0f9d3814e83e5f2f754d3f7abdfa096a0b9
diff --git a/trunk/drivers/pci/dmar.c b/trunk/drivers/pci/dmar.c
@@ -130,9 +130,10 @@ static int __init dmar_parse_dev_scope(void *start, void *end, int *cnt,
 		if (scope->entry_type == ACPI_DMAR_SCOPE_TYPE_ENDPOINT ||
 		    scope->entry_type == ACPI_DMAR_SCOPE_TYPE_BRIDGE)
 			(*cnt)++;
-		else
+		else if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC) {
 			printk(KERN_WARNING PREFIX
-				"Unsupported device scope\n");
+			       "Unsupported device scope\n");
+		}
 		start += scope->length;
 	}
 	if (*cnt == 0)