Commit 85094c05 authored by Jing Xiangfeng's avatar Jing Xiangfeng Committed by Linus Torvalds
Browse files

rapidio: fix the missed put_device() for rio_mport_add_riodev 



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

Fixes: e8de3701 ("rapidio: add mport char device driver")
Signed-off-by: default avatarJing Xiangfeng <jingxiangfeng@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarDan 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fa63f083

drivers/rapidio/devices/rio_mport_cdev.c

+4 −1
Original line number Diff line number Diff line
@@ -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;

	}