diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 20:50:26 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 20:50:26 (GMT) |
| commit | 4cff7adbebf4d25f662b13c6582b945d9d549e25 (patch) | |
| tree | cfb6bc0aaab6ad7fa7ca2bb07453ed2fd139138c /drivers/iommu/amd_iommu.c | |
| parent | 7e3933df9874b70745548ce9177295d11c58fc21 (diff) | |
| parent | 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 (diff) | |
| download | linux-4cff7adbebf4d25f662b13c6582b945d9d549e25.tar.xz | |
Merge 4.5-rc2 into staging-next
This fixes a merge issue with the panel driver, and picks up fixes in
iio and other drivers that we want here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iommu/amd_iommu.c')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 539b0de..e5e2239 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -2049,7 +2049,7 @@ static void do_attach(struct iommu_dev_data *dev_data, /* Update device table */ set_dte_entry(dev_data->devid, domain, ats); if (alias != dev_data->devid) - set_dte_entry(dev_data->devid, domain, ats); + set_dte_entry(alias, domain, ats); device_flush_dte(dev_data); } |