projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-for-davem-2016-07-06' of git://git.kernel.org/pub/scm/linux/kerne...
[cascardo/linux.git]
/
drivers
/
iommu
/
amd_iommu_init.c
diff --git
a/drivers/iommu/amd_iommu_init.c
b/drivers/iommu/amd_iommu_init.c
index
9e00341
..
d091def
100644
(file)
--- 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);