devices/e1000e/netdev-2.6.35-ethercat.c
branchstable-1.5
changeset 2582 87e502828b3f
parent 2500 97fd83907c7c
equal deleted inserted replaced
2581:d94281cb835a 2582:87e502828b3f
  5861 	if (!(adapter->flags & FLAG_HAS_AMT))
  5861 	if (!(adapter->flags & FLAG_HAS_AMT))
  5862 		e1000_get_hw_control(adapter);
  5862 		e1000_get_hw_control(adapter);
  5863 
  5863 
  5864 	adapter->ecdev = ecdev_offer(netdev,ec_poll,THIS_MODULE);
  5864 	adapter->ecdev = ecdev_offer(netdev,ec_poll,THIS_MODULE);
  5865 	if (adapter->ecdev) {
  5865 	if (adapter->ecdev) {
  5866 		if (ecdev_open(adapter->ecdev)) {
  5866 		err = ecdev_open(adapter->ecdev);
       
  5867 		if (err) {
  5867 			ecdev_withdraw(adapter->ecdev);
  5868 			ecdev_withdraw(adapter->ecdev);
  5868 			goto err_register;
  5869 			goto err_register;
  5869 		}
  5870 		}
  5870 	} else {
  5871 	} else {
  5871 		strcpy(netdev->name, "eth%d");
  5872 		strcpy(netdev->name, "eth%d");