firmware: arm_scmi: Fix missing destroy_workqueue()
authorQinglang Miao <miaoqinglang@huawei.com>
Tue, 10 Nov 2020 07:42:21 +0000 (15:42 +0800)
committerSudeep Holla <sudeep.holla@arm.com>
Fri, 13 Nov 2020 11:16:01 +0000 (11:16 +0000)
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>
drivers/firmware/arm_scmi/notify.c

index ce33689..66196b2 100644 (file)
@@ -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);