From: Jan Beulich Date: Mon, 18 Feb 2013 08:37:35 +0000 (+0100) Subject: AMD IOMMU: don't BUG() when we don't have to X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7250 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f547d42ec0306cdceffb8f7603c7e6f8977cf398;p=xen.git AMD IOMMU: don't BUG() when we don't have to find_iommu_for_device() can easily return NULL instead, as all of its callers are prepared for that. Signed-off-by: Jan Beulich --- diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index edf1b9f1f3..0f8cfeb56c 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -32,8 +32,8 @@ struct amd_iommu *find_iommu_for_device(int seg, int bdf) { struct ivrs_mappings *ivrs_mappings = get_ivrs_mappings(seg); - BUG_ON ( bdf >= ivrs_bdf_entries ); - return ivrs_mappings ? ivrs_mappings[bdf].iommu : NULL; + return ivrs_mappings && bdf < ivrs_bdf_entries ? ivrs_mappings[bdf].iommu + : NULL; } /*