diff options
| author | Cristian Marussi <cristian.marussi@arm.com> | 2021-01-12 20:13:26 +0100 |
|---|---|---|
| committer | Sudeep Holla <sudeep.holla@arm.com> | 2021-01-13 15:30:16 +0100 |
| commit | a90b6543bf062d65292b2c76f1630507d1c9d8ec (patch) | |
| tree | 23cf0f0a842385d228ec1a9033e25234ea67fc90 /drivers/firmware/arm_scmi/driver.c | |
| parent | MAINTAINERS: Update ARM SCMI entry (diff) | |
| download | linux-a90b6543bf062d65292b2c76f1630507d1c9d8ec.tar.xz linux-a90b6543bf062d65292b2c76f1630507d1c9d8ec.zip | |
firmware: arm_scmi: Fix call site of scmi_notification_exit
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>
Diffstat (limited to 'drivers/firmware/arm_scmi/driver.c')
| -rw-r--r-- | drivers/firmware/arm_scmi/driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 5392e1fc6b4e..cacdf1589b10 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -848,8 +848,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; @@ -860,6 +858,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); |