lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 179/453] HSI: omap_ssi: Dont jump to free ID in ssi_add_controller()
    Date
    From: Jing Xiangfeng <jingxiangfeng@huawei.com>

    [ 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>
    ---
    drivers/hsi/controllers/omap_ssi_core.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c
    index 4bc4a201f0f6c..2be9c01e175ca 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;
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 14:46    [W:4.055 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site