---

yaml --- r: 197886 b: refs/heads/master c: 4f506e0 h: refs/heads/master v: v3
git-mirror · Apr 14, 2010 · 3c72b87 · 3c72b87
1 parent 506e2b6
commit 3c72b87
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dda565492776b7dff5f8507298d868745e734aab
+refs/heads/master: 4f506e07e0a3dff34427cece255a8f390a78d5a0
diff --git a/trunk/drivers/pci/dmar.c b/trunk/drivers/pci/dmar.c
@@ -1466,5 +1466,7 @@ int __init dmar_ir_support(void)
 {
 	struct acpi_table_dmar *dmar;
 	dmar = (struct acpi_table_dmar *)dmar_tbl;
+	if (!dmar)
+		return 0;
 	return dmar->flags & 0x1;
 }