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; }