summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qualcomm/emac/emac-phy.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-12-05 09:52:17 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-12-05 09:52:17 +0100
commit93cd6fa6806cb3455e8231578840afb031606352 (patch)
tree042f13cde2701b880d512c5cd6b263b0197cc39f /drivers/net/ethernet/qualcomm/emac/emac-phy.c
parentce6612d6844701a5b5a162f201103240c07abd9e (diff)
parentf03ee46be9401e3434f52bb15e92d1e640f76438 (diff)
downloadblackbird-op-linux-93cd6fa6806cb3455e8231578840afb031606352.tar.gz
blackbird-op-linux-93cd6fa6806cb3455e8231578840afb031606352.zip
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Resync, and we need all the fancy new drm_mm stuff to implement more efficient evict algorithms for softpin. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/net/ethernet/qualcomm/emac/emac-phy.c')
-rw-r--r--drivers/net/ethernet/qualcomm/emac/emac-phy.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qualcomm/emac/emac-phy.c b/drivers/net/ethernet/qualcomm/emac/emac-phy.c
index da4e90db4d98..99a14df28b96 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac-phy.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac-phy.c
@@ -212,6 +212,7 @@ int emac_phy_config(struct platform_device *pdev, struct emac_adapter *adpt)
phy_np = of_parse_phandle(np, "phy-handle", 0);
adpt->phydev = of_phy_find_device(phy_np);
+ of_node_put(phy_np);
}
if (!adpt->phydev) {
OpenPOWER on IntegriCloud