Merge tag 'powerpc-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[karo-tx-linux.git] / drivers / net / ethernet / freescale / ucc_geth.c

diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index c30b72e02a1a032361c632a3296d3aea4389c640..5bf1ade2831577741004cf2a1ef3c3ab423c6c55 100644 (file)
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -1385,7 +1385,7 @@ static int adjust_enet_interface(struct ucc_geth_private *ugeth)
                value &= ~0x1000;       /* Turn off autonegotiation */
                phy_write(tbiphy, ENET_TBI_MII_CR, value);
 
-               put_device(&tbiphy->dev);
+               put_device(&tbiphy->mdio.dev);
        }
 
        init_check_frame_length_mode(ug_info->lengthCheckRx, &ug_regs->maccfg2);
@@ -1705,7 +1705,7 @@ static void uec_configure_serdes(struct net_device *dev)
         * several seconds for it to come back.
         */
        if (phy_read(tbiphy, ENET_TBI_MII_SR) & TBISR_LSTATUS) {
-               put_device(&tbiphy->dev);
+               put_device(&tbiphy->mdio.dev);
                return;
        }
 
@@ -1716,7 +1716,7 @@ static void uec_configure_serdes(struct net_device *dev)
 
        phy_write(tbiphy, ENET_TBI_MII_CR, TBICR_SETTINGS);
 
-       put_device(&tbiphy->dev);
+       put_device(&tbiphy->mdio.dev);
 }
 
 /* Configure the PHY for dev.