diff options
| author | Peter Chen <peter.chen@nxp.com> | 2020-12-10 21:31:37 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-27 11:55:17 +0100 |
| commit | 6b81e926bb986d88fcccf2f34e8d2ff50e30090f (patch) | |
| tree | 4d39b1da6abdddeb2ca27018446247cb3e93d976 | |
| parent | cc7f1a32424ef6689665a91e66c43f6836889623 (diff) | |
| download | kernel_replicant_linux-6b81e926bb986d88fcccf2f34e8d2ff50e30090f.tar.gz kernel_replicant_linux-6b81e926bb986d88fcccf2f34e8d2ff50e30090f.tar.bz2 kernel_replicant_linux-6b81e926bb986d88fcccf2f34e8d2ff50e30090f.zip | |
usb: cdns3: imx: fix can't create core device the second time issue
commit 2ef02b846ee2526249a562a66d6dcb25fcbca9d8 upstream.
The cdns3 core device is populated by calling of_platform_populate,
the flag OF_POPULATED is set for core device node, if this flag
is not cleared, when calling of_platform_populate the second time
after loading parent module again, the OF code will not try to create
platform device for core device.
To fix it, it uses of_platform_depopulate to depopulate the core
device which the parent created, and the flag OF_POPULATED for
core device node will be cleared accordingly.
Cc: <stable@vger.kernel.org>
Fixes: 1e056efab993 ("usb: cdns3: add NXP imx8qm glue layer")
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/cdns3/cdns3-imx.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/usb/cdns3/cdns3-imx.c b/drivers/usb/cdns3/cdns3-imx.c index fd6ad0fd7244..7e728aab6475 100644 --- a/drivers/usb/cdns3/cdns3-imx.c +++ b/drivers/usb/cdns3/cdns3-imx.c @@ -218,20 +218,11 @@ err: return ret; } -static int cdns_imx_remove_core(struct device *dev, void *data) -{ - struct platform_device *pdev = to_platform_device(dev); - - platform_device_unregister(pdev); - - return 0; -} - static int cdns_imx_remove(struct platform_device *pdev) { struct device *dev = &pdev->dev; - device_for_each_child(dev, NULL, cdns_imx_remove_core); + of_platform_depopulate(dev); platform_set_drvdata(pdev, NULL); return 0; |