diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-06 17:10:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-06 17:10:28 +0200 |
| commit | 82fc167c392a1700f9adbde639730ee8c8122474 (patch) | |
| tree | 373ab737a040dd21e5f98425e7c82a6cc4a83568 /drivers/net/ethernet/xilinx/xilinx_emaclite.c | |
| parent | e3e72ab80a3fac0b88e07d358a2c75724ccd66b4 (diff) | |
| parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
| download | linux-82fc167c392a1700f9adbde639730ee8c8122474.tar.gz linux-82fc167c392a1700f9adbde639730ee8c8122474.tar.bz2 linux-82fc167c392a1700f9adbde639730ee8c8122474.zip | |
Merge tag 'v4.3-rc4' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/xilinx/xilinx_emaclite.c')
| -rw-r--r-- | drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 6008eee01a33..cf468c87ce57 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c @@ -828,6 +828,8 @@ static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev) if (!phydev) dev_info(dev, "MDIO of the phy is not registered yet\n"); + else + put_device(&phydev->dev); return 0; } |