From: Qinglang Miao miaoqinglang@huawei.com
[ Upstream commit 59165d16c699182b86b5c65181013f1fd88feb62 ]
Add the missing destroy_workqueue() before return from i3c_master_register in the error handling case.
Signed-off-by: Qinglang Miao miaoqinglang@huawei.com Signed-off-by: Boris Brezillon boris.brezillon@collabora.com Link: https://lore.kernel.org/linux-i3c/20201028091543.136167-1-miaoqinglang@huawe... Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/i3c/master.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index 6cc71c90f85ea..19337aed9f235 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -2492,7 +2492,7 @@ int i3c_master_register(struct i3c_master_controller *master,
ret = i3c_master_bus_init(master); if (ret) - goto err_put_dev; + goto err_destroy_wq;
ret = device_add(&master->dev); if (ret) @@ -2523,6 +2523,9 @@ int i3c_master_register(struct i3c_master_controller *master, err_cleanup_bus: i3c_master_bus_cleanup(master);
+err_destroy_wq: + destroy_workqueue(master->wq); + err_put_dev: put_device(&master->dev);