From eec6a52a69331199b6e67a719bf01a636718ee26 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 8 Apr 2010 19:58:22 +0100 Subject: [PATCH] --- yaml --- r: 197883 b: refs/heads/master c: 5715f0f9d3814e83e5f2f754d3f7abdfa096a0b9 h: refs/heads/master i: 197881: a6a9cbd2d91ab2a9f6eda003d94d22e641f6ebcb 197879: 6e9eb17b20eb8ce68e142a1e9b8e466b8263484f v: v3 --- [refs] | 2 +- trunk/drivers/pci/dmar.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 05a0fac8d795..85e6bb1d86f5 100644 --- 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 index ffe22bc3ac8e..a04bde9bd10f 100644 --- 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)