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: bd31b24969
("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>
This commit is contained in:
Родитель
3cea11cd5e
Коммит
6bbdb46c4b
|
@ -1474,17 +1474,17 @@ int scmi_notification_init(struct scmi_handle *handle)
|
||||||
ni->gid = gid;
|
ni->gid = gid;
|
||||||
ni->handle = handle;
|
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),
|
ni->notify_wq = alloc_workqueue(dev_name(handle->dev),
|
||||||
WQ_UNBOUND | WQ_FREEZABLE | WQ_SYSFS,
|
WQ_UNBOUND | WQ_FREEZABLE | WQ_SYSFS,
|
||||||
0);
|
0);
|
||||||
if (!ni->notify_wq)
|
if (!ni->notify_wq)
|
||||||
goto err;
|
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);
|
mutex_init(&ni->pending_mtx);
|
||||||
hash_init(ni->pending_events_handlers);
|
hash_init(ni->pending_events_handlers);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче