diff options
| author | Jing Xiangfeng <jingxiangfeng@huawei.com> | 2020-10-12 10:56:43 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-30 11:53:24 +0100 |
| commit | 9e363d142f2e87dc215503533b9828e81e12f917 (patch) | |
| tree | 9a925b727a70227ce02e89eee73eedabb140dac9 /drivers/hsi | |
| parent | 38429d879dcd1d4743448ef08b425bdf5d8252f9 (diff) | |
| download | linux-stable-9e363d142f2e87dc215503533b9828e81e12f917.tar.gz linux-stable-9e363d142f2e87dc215503533b9828e81e12f917.tar.bz2 linux-stable-9e363d142f2e87dc215503533b9828e81e12f917.zip | |
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: 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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/hsi')
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi_core.c | 2 |
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; |