diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-18 10:43:14 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-18 10:45:48 -0400 |
commit | f82851a8a480a26611175f064f54e17f5f7b01ae (patch) | |
tree | 6649d01d7adb0f1e3e5357f10082cb9823d2a40d /drivers/pci/dmar.c | |
parent | bb9e6d65078da2f38cfe1067cfd31a896ca867c0 (diff) |
dmar: fix uninitialised 'ret' variable in dmar_parse_dev()
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>
Diffstat (limited to 'drivers/pci/dmar.c')
-rw-r--r-- | drivers/pci/dmar.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c index b65173828bc2..7b3751136e63 100644 --- a/drivers/pci/dmar.c +++ b/drivers/pci/dmar.c | |||
@@ -188,12 +188,11 @@ dmar_parse_one_drhd(struct acpi_dmar_header *header) | |||
188 | return 0; | 188 | return 0; |
189 | } | 189 | } |
190 | 190 | ||
191 | static int __init | 191 | static int __init dmar_parse_dev(struct dmar_drhd_unit *dmaru) |
192 | dmar_parse_dev(struct dmar_drhd_unit *dmaru) | ||
193 | { | 192 | { |
194 | struct acpi_dmar_hardware_unit *drhd; | 193 | struct acpi_dmar_hardware_unit *drhd; |
195 | static int include_all; | 194 | static int include_all; |
196 | int ret; | 195 | int ret = 0; |
197 | 196 | ||
198 | drhd = (struct acpi_dmar_hardware_unit *) dmaru->hdr; | 197 | drhd = (struct acpi_dmar_hardware_unit *) dmaru->hdr; |
199 | 198 | ||