net: ucc_geth: make probe consistently acquire a reference to the phy node
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Thu, 7 Aug 2014 21:48:25 +0000 (23:48 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Aug 2014 23:02:59 +0000 (16:02 -0700)
When the driver attaches to a device that has a phy handle the probe
routine returns with a reference to that node. This reference is
correctly dropped in the error path and the remove function. In the
fixed phy case however no reference is acquired and so the error path
might drop a reference the driver isn't holding. Fix that by getting a
reference to the MAC.

Fixes: 87009814cdbb ("ucc_geth: use the new fixed PHY helpers")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/ucc_geth.c

index f6b956952269a58c5e8676c4a7b63271508a5f38..0c83ef078ddf743158cbdc52bc9f47404a38414c 100644 (file)
@@ -3794,7 +3794,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)
                        if (err)
                                return err;
                }
-               ug_info->phy_node = np;
+               ug_info->phy_node = of_node_get(np);
        }
 
        /* Find the TBI PHY node.  If it's not there, we don't support SGMII */