Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43f146dc authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Greg Kroah-Hartman
Browse files

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: 46a2bb5a ("slimbus: core: Add slim controllers support")
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200925095520.27316-2-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a114d642

drivers/slimbus/core.c

+2 −2
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ void slim_report_absent(struct slim_device *sbdev) 
	mutex_lock(&ctrl->lock);

	sbdev->is_laddr_valid = false;

	mutex_unlock(&ctrl->lock);



	if (!ctrl->get_laddr)

		ida_simple_remove(&ctrl->laddr_ida, sbdev->laddr);

	slim_device_update_status(sbdev, SLIM_DEVICE_STATUS_DOWN);

}