From fbd7330c9fd8ef00bf231ec7e57b0f05384f462d Mon Sep 17 00:00:00 2001 From: Fabien Dessenne Date: Fri, 8 Mar 2019 17:53:46 +0100 Subject: hwspinlock: ignore disabled device Do not wait for hwspinlock device registration if it is not available for use. Acked-by: Suman Anna Signed-off-by: Fabien Dessenne Signed-off-by: Bjorn Andersson --- drivers/hwspinlock/hwspinlock_core.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'drivers/hwspinlock') diff --git a/drivers/hwspinlock/hwspinlock_core.c b/drivers/hwspinlock/hwspinlock_core.c index 2bad40d42210..d806307f19c2 100644 --- a/drivers/hwspinlock/hwspinlock_core.c +++ b/drivers/hwspinlock/hwspinlock_core.c @@ -333,6 +333,11 @@ int of_hwspin_lock_get_id(struct device_node *np, int index) if (ret) return ret; + if (!of_device_is_available(args.np)) { + ret = -ENOENT; + goto out; + } + /* Find the hwspinlock device: we need its base_id */ ret = -EPROBE_DEFER; rcu_read_lock(); -- cgit v1.2.3