diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2020-09-25 10:55:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-29 09:57:42 +0100 |
| commit | 9da3ff3368b76db3168736608774c98dde100a4c (patch) | |
| tree | 8d1fba01ef050fa55f6d20cf37cb411b765229c1 | |
| parent | b7e2b1fe04bf5dc2b77f2493806d4babe1c9b6fb (diff) | |
slimbus: core: check get_addr before removing laddr ida
[ Upstream commit f97769fde678e111a1b7b165b380d8a3dfe54f4e ]
logical address can be either assigned by the SLIMBus controller or the core.
Core uses IDA in cases where get_addr callback is not provided by the
controller.
Core already has this check while allocating IDR, however during absence
reporting this is not checked. This patch fixes this issue.
Fixes: 46a2bb5a7f7e ("slimbus: core: Add slim controllers support")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200925095520.27316-2-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/slimbus/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/slimbus/core.c b/drivers/slimbus/core.c index 63ee96eb58c6..42a233fc5dc6 100644 --- a/drivers/slimbus/core.c +++ b/drivers/slimbus/core.c @@ -327,8 +327,8 @@ void slim_report_absent(struct slim_device *sbdev) mutex_lock(&ctrl->lock); sbdev->is_laddr_valid = false; mutex_unlock(&ctrl->lock); - - ida_simple_remove(&ctrl->laddr_ida, sbdev->laddr); + if (!ctrl->get_laddr) + ida_simple_remove(&ctrl->laddr_ida, sbdev->laddr); slim_device_update_status(sbdev, SLIM_DEVICE_STATUS_DOWN); } EXPORT_SYMBOL_GPL(slim_report_absent); |