diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-08 18:27:47 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-08 18:27:47 +0300 |
| commit | 9e7f7f5425e6d1492109a537ee88c99b29580655 (patch) | |
| tree | 81f9d68abb5b793aadaf80bd6940af04e3c16eb9 /drivers/iommu/amd_iommu_init.c | |
| parent | 6daa2ec0b3e3808c55329d12de3c157cf38b17b0 (diff) | |
| parent | f80fd3a5fff88a9ace7e8cd11d07cf874a63ea9f (diff) | |
| download | linux-9e7f7f5425e6d1492109a537ee88c99b29580655.tar.xz | |
Merge branch 'x86/mm' into x86/boot, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/iommu/amd_iommu_init.c')
| -rw-r--r-- | drivers/iommu/amd_iommu_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 9e0034196e10..d091defc3426 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -1107,13 +1107,13 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu, break; } + devid = e->devid; DUMP_printk(" DEV_ACPI_HID(%s[%s])\t\tdevid: %02x:%02x.%x\n", hid, uid, PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid)); - devid = e->devid; flags = e->flags; ret = add_acpi_hid_device(hid, uid, &devid, false); |