From patchwork series 486081

Fox Snowpatch · Fox Snowpatch · commit 79acf698e765 · 2025-12-19T23:05:32.000Z
https://patchwork.ozlabs.org//project/linuxppc-dev/list/?series=486081
diff --git 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
@@ -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
@@ -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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,7 @@ static int fsl_rio_setup(struct platform_device *dev)`
`697`	`697`	`if (rio_register_mport(port)) {`
`698`	`698`	`release_resource(&port->iores);`
`699`	`699`	`kfree(priv);`
`700`		`- kfree(port);`
	`700`	`+ put_device(&port->dev);`
`701`	`701`	`continue;`
`702`	`702`	`}`
`703`	`703`	`active_ports++;`
Original file line number	Diff line number	Diff line change
`@@ -2758,6 +2758,7 @@ static int tsi721_setup_mport(struct tsi721_device *priv)`
`2758`	`2758`	`err = rio_register_mport(mport);`
`2759`	`2759`	`if (err) {`
`2760`	`2760`	`tsi721_unregister_dma(priv);`
	`2761`	`+ put_device(&mport->dev);`
`2761`	`2762`	`goto err_exit;`
`2762`	`2763`	`}`
`2763`	`2764`
Original file line number	Diff line number	Diff line change
`@@ -2089,7 +2089,6 @@ int rio_register_mport(struct rio_mport *port)`
`2089`	`2089`	`mutex_lock(&rio_mport_list_lock);`
`2090`	`2090`	`list_del(&port->node);`
`2091`	`2091`	`mutex_unlock(&rio_mport_list_lock);`
`2092`		`- put_device(&port->dev);`
`2093`	`2092`	`} else {`
`2094`	`2093`	`dev_dbg(&port->dev, "RIO: registered mport%d\n", port->id);`
`2095`	`2094`	`}`