diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-27 16:34:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-27 16:34:40 +0200 |
| commit | ae9a6149884e04b3460bd9d7ffe29c5ec8d223d8 (patch) | |
| tree | 373e19c07802ce43862f4a37a141f628bca0a401 /drivers/net/ethernet/cadence/macb_pci.c | |
| parent | 8217f07a50236779880f13e87f99224cd9117f83 (diff) | |
| parent | 5816b3e6577eaa676ceb00a848f0fd65fe2adc29 (diff) | |
| download | linux-ae9a6149884e04b3460bd9d7ffe29c5ec8d223d8.tar.gz linux-ae9a6149884e04b3460bd9d7ffe29c5ec8d223d8.tar.bz2 linux-ae9a6149884e04b3460bd9d7ffe29c5ec8d223d8.zip | |
Merge 5.15-rc3 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/cadence/macb_pci.c')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c index 8b7b59908a1a..f66d22de5168 100644 --- a/drivers/net/ethernet/cadence/macb_pci.c +++ b/drivers/net/ethernet/cadence/macb_pci.c @@ -111,9 +111,9 @@ static void macb_remove(struct pci_dev *pdev) struct platform_device *plat_dev = pci_get_drvdata(pdev); struct macb_platform_data *plat_data = dev_get_platdata(&plat_dev->dev); - platform_device_unregister(plat_dev); clk_unregister(plat_data->pclk); clk_unregister(plat_data->hclk); + platform_device_unregister(plat_dev); } static const struct pci_device_id dev_id_table[] = { |