]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
dmar: fix uninitialised 'ret' variable in dmar_parse_dev()
authorDavid Woodhouse <David.Woodhouse@intel.com>
Sat, 18 Oct 2008 14:43:14 +0000 (15:43 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Sat, 18 Oct 2008 14:45:48 +0000 (15:45 +0100)
This was introduced by commit 1886e8a90a580f3ad343f2065c84c1b9e1dac9ef
("x64, x2apic/intr-remap: code re-structuring, to be used by both DMA
and Interrupt remapping"). It was causing bogus results to be returned
from dmar_parse_dev() when the first unit with the INCLUDE_ALL flag was
processed.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/pci/dmar.c

index b65173828bc20d5661333bcd4cb9fc59355fe1ab..7b3751136e63734054d3f53a84ec52f256cb463c 100644 (file)
@@ -188,12 +188,11 @@ dmar_parse_one_drhd(struct acpi_dmar_header *header)
        return 0;
 }
 
-static int __init
-dmar_parse_dev(struct dmar_drhd_unit *dmaru)
+static int __init dmar_parse_dev(struct dmar_drhd_unit *dmaru)
 {
        struct acpi_dmar_hardware_unit *drhd;
        static int include_all;
-       int ret;
+       int ret = 0;
 
        drhd = (struct acpi_dmar_hardware_unit *) dmaru->hdr;