summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJing Xiangfeng <jingxiangfeng@huawei.com>2020-10-12 05:56:43 +0300
committerSebastian Reichel <sebastian.reichel@collabora.com>2020-11-29 02:39:29 +0300
commit41fff6e19bc8d6d8bca79ea388427c426e72e097 (patch)
tree7170407612b1aafaabcb5eac538b542d0058164a
parent3650b228f83adda7e5ee532e2b90429c03f7b9ec (diff)
downloadlinux-41fff6e19bc8d6d8bca79ea388427c426e72e097.tar.xz
HSI: omap_ssi: Don't jump to free ID in ssi_add_controller()
In current code, it jumps to ida_simple_remove() when ida_simple_get() failes to allocate an ID. Just return to fix it. Fixes: 0fae198988b8 ("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>
-rw-r--r--drivers/hsi/controllers/omap_ssi_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c
index fa69b94debd9..7596dc164648 100644
--- a/drivers/hsi/controllers/omap_ssi_core.c
+++ b/drivers/hsi/controllers/omap_ssi_core.c
@@ -355,7 +355,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;