From 3c72b87ba1a616dd0b7dafea6bb8ba876bd13f7d Mon Sep 17 00:00:00 2001
From: Arnaud Patard <apatard@mandriva.com>
Date: Thu, 25 Mar 2010 18:02:58 +0000
Subject: [PATCH] --- yaml --- r: 197886 b: refs/heads/master c:
 4f506e07e0a3dff34427cece255a8f390a78d5a0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e8c906a26a4e..85317802813a 100644
--- 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
index edc5f002e055..7771b2dd5978 100644
--- 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;
 }