[PATCH master] driver: disassociate dev from device_node on unregister_device

[PATCH master] driver: disassociate dev from device_node on unregister_device

[Ahmad Fatoum]

Reusing the same device node with of_platform_device_create
after unregistering an old device doesn't work, because the device_node
-> device_d association added along with deep probe isn't cleared.
Resolve this.

Fixes: 46afd4bf8fa6 ("of: platform: Keep track of populated platform devices")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/base/driver.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 4898e0114d56..e7288f6a61cc 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -265,6 +265,8 @@ int unregister_device(struct device_d *old_dev)
 	/* remove device from parents child list */
 	if (old_dev->parent)
 		list_del(&old_dev->sibling);
+	if (dev_of_node(old_dev))
+		old_dev->device_node->dev = NULL;
 
 	return 0;
 }
-- 
2.30.2

Re: [PATCH master] driver: disassociate dev from device_node on unregister_device

[Sascha Hauer]

On Mon, Jul 25, 2022 at 09:43:00AM +0200, Ahmad Fatoum wrote:
> Reusing the same device node with of_platform_device_create
> after unregistering an old device doesn't work, because the device_node
> -> device_d association added along with deep probe isn't cleared.
> Resolve this.
> 
> Fixes: 46afd4bf8fa6 ("of: platform: Keep track of populated platform devices")
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  drivers/base/driver.c | 2 ++
>  1 file changed, 2 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/drivers/base/driver.c b/drivers/base/driver.c
> index 4898e0114d56..e7288f6a61cc 100644
> --- a/drivers/base/driver.c
> +++ b/drivers/base/driver.c
> @@ -265,6 +265,8 @@ int unregister_device(struct device_d *old_dev)
>  	/* remove device from parents child list */
>  	if (old_dev->parent)
>  		list_del(&old_dev->sibling);
> +	if (dev_of_node(old_dev))
> +		old_dev->device_node->dev = NULL;
>  
>  	return 0;
>  }
> -- 
> 2.30.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |