firmware: arm_scmi: Fix call site of scmi_notification_exit

[ Upstream commit a90b6543bf062d65292b2c76f1630507d1c9d8ec ]

Call scmi_notification_exit() only when SCMI platform driver instance has
been really successfully removed.

Link: https://lore.kernel.org/r/20210112191326.29091-1-cristian.marussi@arm.com
Fixes: 6b8a69131dc63 ("firmware: arm_scmi: Enable notification core")
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
[sudeep.holla: Move the call outside the list mutex locking]
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 3dfd8b6..6b2ce3f 100644 (file)
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -847,8 +847,6 @@ static int scmi_remove(struct platform_device *pdev)
        struct scmi_info *info = platform_get_drvdata(pdev);
        struct idr *idr = &info->tx_idr;
 
-       scmi_notification_exit(&info->handle);
-
        mutex_lock(&scmi_list_mutex);
        if (info->users)
                ret = -EBUSY;
@@ -859,6 +857,8 @@ static int scmi_remove(struct platform_device *pdev)
        if (ret)
                return ret;
 
+       scmi_notification_exit(&info->handle);
+
        /* Safe to free channels since no more users */
        ret = idr_for_each(idr, info->desc->ops->chan_free, idr);
        idr_destroy(&info->tx_idr);