branch | stable-1.5 |
changeset 2378 | ca345abf0565 |
parent 2251 | 5023ce75fe91 |
child 2582 | 87e502828b3f |
--- a/devices/r8169-2.6.37-ethercat.c Tue Apr 10 19:09:51 2012 +0200 +++ b/devices/r8169-2.6.37-ethercat.c Tue Apr 10 19:10:56 2012 +0200 @@ -4956,6 +4956,9 @@ struct net_device *dev = pci_get_drvdata(pdev); struct rtl8169_private *tp = netdev_priv(dev); + if (tp->ecdev) + return -EBUSY; + rtl8169_init_phy(dev, tp); if (netif_running(dev))