summaryrefslogtreecommitdiff
path: root/drivers/iommu
diff options
context:
space:
mode:
authorSimon Xue <xxm@rock-chips.com>2018-02-08 16:10:56 +0800
committerTao Huang <huangtao@rock-chips.com>2018-02-09 11:08:29 +0800
commited2deb39578ddd25d8d75642076ddb3c83df2df2 (patch)
tree8ace727bd2cef56868da5429626bf095611d35c6 /drivers/iommu
parent5be2cb19cf8e678655b59ec70c6a5f66f08d9418 (diff)
iommu/rockchip: return -ENODEV when a disabled iommu node is referenced by master
When a disabled iommu node is referenced by a master which cause the previous iommu nodes removed from the iommu group, finally cause kernel crash, return -ENODEV instead -EPROBE_DEFER if iommu node disabled can fix this issue Change-Id: I3adf3f4119ff6fff0a2068301338813f5aca8969 Signed-off-by: Simon Xue <xxm@rock-chips.com>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/rockchip-iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index c174b6c1433c..3ef7d54576df 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1105,7 +1105,7 @@ static int rk_iommu_group_set_iommudata(struct iommu_group *group,
of_node_put(args.np);
if (!pd) {
dev_err(dev, "iommu %s not found\n", args.np->full_name);
- return -EPROBE_DEFER;
+ return -ENODEV;
}
/* TODO(djkurtz): handle multiple slave iommus for a single master */