Skip to content

Commit

Permalink
iommu/vt-d: Propagate error-value from ir_parse_ioapic_hpet_scope()
Browse files Browse the repository at this point in the history
Propagate the error-value from the function ir_parse_ioapic_hpet_scope()
in parse_ioapics_under_ir() and cleanup its calling loop.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
Joerg Roedel committed Oct 23, 2015
1 parent a13c8f2 commit 66ef950
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions drivers/iommu/intel_irq_remapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -934,13 +934,18 @@ static int __init parse_ioapics_under_ir(void)
bool ir_supported = false;
int ioapic_idx;

for_each_iommu(iommu, drhd)
if (ecap_ir_support(iommu->ecap)) {
if (ir_parse_ioapic_hpet_scope(drhd->hdr, iommu))
return -1;
for_each_iommu(iommu, drhd) {
int ret;

ir_supported = true;
}
if (!ecap_ir_support(iommu->ecap))
continue;

ret = ir_parse_ioapic_hpet_scope(drhd->hdr, iommu);
if (ret)
return ret;

ir_supported = true;
}

if (!ir_supported)
return -ENODEV;
Expand Down

0 comments on commit 66ef950

Please sign in to comment.