lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 423/633] rapidio: fix the missed put_device() for rio_mport_add_riodev
    Date
    From: Jing Xiangfeng <jingxiangfeng@huawei.com>

    [ Upstream commit 85094c05eeb47d195a74a25366a2db066f1c9d47 ]

    rio_mport_add_riodev() misses to call put_device() when the device already
    exists. Add the missed function call to fix it.

    Fixes: e8de370188d0 ("rapidio: add mport char device driver")
    Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
    Cc: Matt Porter <mporter@kernel.crashing.org>
    Cc: Alexandre Bounine <alex.bou9@gmail.com>
    Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
    Cc: John Hubbard <jhubbard@nvidia.com>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: Madhuparna Bhowmik <madhuparnabhowmik10@gmail.com>
    Link: https://lkml.kernel.org/r/20200922072525.42330-1-jingxiangfeng@huawei.com
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/rapidio/devices/rio_mport_cdev.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
    index 438cbf994c57f..152946e033d17 100644
    --- a/drivers/rapidio/devices/rio_mport_cdev.c
    +++ b/drivers/rapidio/devices/rio_mport_cdev.c
    @@ -1680,6 +1680,7 @@ static int rio_mport_add_riodev(struct mport_cdev_priv *priv,
    struct rio_dev *rdev;
    struct rio_switch *rswitch = NULL;
    struct rio_mport *mport;
    + struct device *dev;
    size_t size;
    u32 rval;
    u32 swpinfo = 0;
    @@ -1694,8 +1695,10 @@ static int rio_mport_add_riodev(struct mport_cdev_priv *priv,
    rmcd_debug(RDEV, "name:%s ct:0x%x did:0x%x hc:0x%x", dev_info.name,
    dev_info.comptag, dev_info.destid, dev_info.hopcount);

    - if (bus_find_device_by_name(&rio_bus_type, NULL, dev_info.name)) {
    + dev = bus_find_device_by_name(&rio_bus_type, NULL, dev_info.name);
    + if (dev) {
    rmcd_debug(RDEV, "device %s already exists", dev_info.name);
    + put_device(dev);
    return -EEXIST;
    }

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 18:05    [W:3.879 / U:0.512 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site