Merge tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-microblaze.git] / drivers / staging / octeon / ethernet-sgmii.c

diff --git a/drivers/staging/octeon/ethernet-sgmii.c b/drivers/staging/octeon/ethernet-sgmii.c
index e187844..21a7a17 100644 (file)
--- a/drivers/staging/octeon/ethernet-sgmii.c
+++ b/drivers/staging/octeon/ethernet-sgmii.c
@@ -99,6 +99,7 @@ int cvm_oct_sgmii_open(struct net_device *dev)
 
        if (priv->phydev) {
                int r = phy_read_status(priv->phydev);
+
                if (r == 0 && priv->phydev->link == 0)
                        netif_carrier_off(dev);
                cvm_oct_adjust_link(dev);