[PATCH] powerpc/fsl_rio: fix a improper release in fsl_rio_setup()

[Haoxiang Li]

If rio_register_mport() fails, put_device() is the correct way
to drop the device reference.
To prevent a double free, remove put_device() in rio_register_mport()
Also, add a put_device() in tsi721_setup_mport() to prevent reference
leak.

Found by code review.

Signed-off-by: Haoxiang Li <lihaoxiang at isrc.iscas.ac.cn>
---
 arch/powerpc/sysdev/fsl_rio.c    | 2 +-
 drivers/rapidio/devices/tsi721.c | 1 +
 drivers/rapidio/rio.c            | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index f9b214b299e7..f6226b2619ed 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -697,7 +697,7 @@ static int fsl_rio_setup(struct platform_device *dev)
 		if (rio_register_mport(port)) {
 			release_resource(&port->iores);
 			kfree(priv);
-			kfree(port);
+			put_device(&port->dev);
 			continue;
 		}
 		active_ports++;
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
index 4b84270a8906..17c2bcf29c5c 100644
--- a/drivers/rapidio/devices/tsi721.c
+++ b/drivers/rapidio/devices/tsi721.c
@@ -2758,6 +2758,7 @@ static int tsi721_setup_mport(struct tsi721_device *priv)
 	err = rio_register_mport(mport);
 	if (err) {
 		tsi721_unregister_dma(priv);
+		put_device(&mport->dev);
 		goto err_exit;
 	}
 
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 46daf32ea13b..026b2328afd7 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -2089,7 +2089,6 @@ int rio_register_mport(struct rio_mport *port)
 		mutex_lock(&rio_mport_list_lock);
 		list_del(&port->node);
 		mutex_unlock(&rio_mport_list_lock);
-		put_device(&port->dev);
 	} else {
 		dev_dbg(&port->dev, "RIO: registered mport%d\n", port->id);
 	}
-- 
2.25.1