diff options
| author | Qinglang Miao <miaoqinglang@huawei.com> | 2020-11-10 15:42:21 +0800 |
|---|---|---|
| committer | Sudeep Holla <sudeep.holla@arm.com> | 2020-11-13 11:16:01 +0000 |
| commit | 6bbdb46c4b1bd57839c9c0a110bd81b0be0a4046 (patch) | |
| tree | 22e3fb7e7306e4e1c02a04d953e9a2d1ddcc9154 /drivers/firmware/arm_scmi/notify.c | |
| parent | 3cea11cd5e3b00d91caf0b4730194039b45c5891 (diff) | |
firmware: arm_scmi: Fix missing destroy_workqueue()
destroy_workqueue is required before the return from scmi_notification_init
in case devm_kcalloc fails to allocate registered_protocols. Fix this by
simply moving registered_protocols allocation before alloc_workqueue.
Link: https://lore.kernel.org/r/20201110074221.41235-1-miaoqinglang@huawei.com
Fixes: bd31b249692e ("firmware: arm_scmi: Add notification dispatch and delivery")
Suggested-by: Cristian Marussi <cristian.marussi@arm.com>
Reviewed-by: Cristian Marussi <cristian.marussi@arm.com>
Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Diffstat (limited to 'drivers/firmware/arm_scmi/notify.c')
| -rw-r--r-- | drivers/firmware/arm_scmi/notify.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/firmware/arm_scmi/notify.c b/drivers/firmware/arm_scmi/notify.c index ce336899d636..66196b293b6c 100644 --- a/drivers/firmware/arm_scmi/notify.c +++ b/drivers/firmware/arm_scmi/notify.c @@ -1474,17 +1474,17 @@ int scmi_notification_init(struct scmi_handle *handle) ni->gid = gid; ni->handle = handle; + ni->registered_protocols = devm_kcalloc(handle->dev, SCMI_MAX_PROTO, + sizeof(char *), GFP_KERNEL); + if (!ni->registered_protocols) + goto err; + ni->notify_wq = alloc_workqueue(dev_name(handle->dev), WQ_UNBOUND | WQ_FREEZABLE | WQ_SYSFS, 0); if (!ni->notify_wq) goto err; - ni->registered_protocols = devm_kcalloc(handle->dev, SCMI_MAX_PROTO, - sizeof(char *), GFP_KERNEL); - if (!ni->registered_protocols) - goto err; - mutex_init(&ni->pending_mtx); hash_init(ni->pending_events_handlers); |