diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2018-10-01 13:20:45 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2018-10-01 13:20:45 +0200 |
| commit | 30aa69e7bd9f7af3574120249eecb3726dcaf737 (patch) | |
| tree | b4a9ec1374ec9aed1022fdb32802c483952e5a97 /drivers/iommu/intel-iommu.c | |
| parent | pinctrl: sprd: Move DT parsing before registering pinctrl device (diff) | |
| parent | Linux 4.19-rc6 (diff) | |
| download | linux-30aa69e7bd9f7af3574120249eecb3726dcaf737.tar.xz linux-30aa69e7bd9f7af3574120249eecb3726dcaf737.zip | |
Merge tag 'v4.19-rc6' into devel
This is the 4.19-rc6 release
I needed to merge this in because of extensive conflicts in
the MSM and Intel pin control drivers. I know how to resolve
them, so let's do it like this.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/iommu/intel-iommu.c')
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 5f3f10cf9d9d..bedc801b06a0 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -2540,9 +2540,9 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu, if (dev && dev_is_pci(dev) && info->pasid_supported) { ret = intel_pasid_alloc_table(dev); if (ret) { - __dmar_remove_one_dev_info(info); - spin_unlock_irqrestore(&device_domain_lock, flags); - return NULL; + pr_warn("No pasid table for %s, pasid disabled\n", + dev_name(dev)); + info->pasid_supported = 0; } } spin_unlock_irqrestore(&device_domain_lock, flags); |