Commit 67bfda5a authored Oct 12, 2020 by Jing Xiangfeng Committed by Greg Kroah-Hartman Dec 29, 2020

HSI: omap_ssi: Don't jump to free ID in ssi_add_controller()



[ Upstream commit 41fff6e19bc8d6d8bca79ea388427c426e72e097 ]

In current code, it jumps to ida_simple_remove() when ida_simple_get()
failes to allocate an ID. Just return to fix it.

Fixes: 0fae1989 ("HSI: omap_ssi: built omap_ssi and omap_ssi_port into one module")
Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 9bd40807

drivers/hsi/controllers/omap_ssi_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -391,7 +391,7 @@ static int ssi_add_controller(struct hsi_controller *ssi,

		err = ida_simple_get(&platform_omap_ssi_ida, 0, 0, GFP_KERNEL);
		if (err < 0)
		goto out_err;
		return err;
		ssi->id = err;

		ssi->owner = THIS_MODULE;