Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / octeon / ethernet-rgmii.c

diff --git a/drivers/staging/octeon/ethernet-rgmii.c b/drivers/staging/octeon/ethernet-rgmii.c
index 48846dffc8e1161d2a78f7db3ebb6b5d28237424..4e7304210bb91ee257fe077d43d6878e5e26a660 100644 (file)
--- a/drivers/staging/octeon/ethernet-rgmii.c
+++ b/drivers/staging/octeon/ethernet-rgmii.c
@@ -117,7 +117,10 @@ static void cvm_oct_rgmii_poll(struct net_device *dev)
        cvmx_helper_link_info_t link_info;
        bool status_change;
 
-       link_info = cvmx_helper_link_autoconf(priv->port);
+       link_info = cvmx_helper_link_get(priv->port);
+       if (priv->link_info != link_info.u64 &&
+           cvmx_helper_link_set(priv->port, link_info))
+               link_info.u64 = priv->link_info;
        status_change = priv->link_info != link_info.u64;
        priv->link_info = link_info.u64;