diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-31 09:03:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-31 09:03:10 +0200 |
| commit | 2d06954e23375a8d299131eddede3a1720bf8539 (patch) | |
| tree | 97fd2961e7ef0b2a948824c035682719e232ab10 /drivers/net/mdio/mdio-octeon.c | |
| parent | firmware: stratix10-svc: Fix a resource leak in an error handling path (diff) | |
| parent | Linux 5.13-rc4 (diff) | |
| download | linux-2d06954e23375a8d299131eddede3a1720bf8539.tar.xz linux-2d06954e23375a8d299131eddede3a1720bf8539.zip | |
Merge 5.13-rc4 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/mdio/mdio-octeon.c')
| -rw-r--r-- | drivers/net/mdio/mdio-octeon.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/mdio/mdio-octeon.c b/drivers/net/mdio/mdio-octeon.c index 8ce99c4888e1..e096e68ac667 100644 --- a/drivers/net/mdio/mdio-octeon.c +++ b/drivers/net/mdio/mdio-octeon.c @@ -71,7 +71,6 @@ static int octeon_mdiobus_probe(struct platform_device *pdev) return 0; fail_register: - mdiobus_free(bus->mii_bus); smi_en.u64 = 0; oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); return err; @@ -85,7 +84,6 @@ static int octeon_mdiobus_remove(struct platform_device *pdev) bus = platform_get_drvdata(pdev); mdiobus_unregister(bus->mii_bus); - mdiobus_free(bus->mii_bus); smi_en.u64 = 0; oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); return 0; |