devices/e1000e/netdev-2.6.32-ethercat.c
branchstable-1.5
changeset 2582 87e502828b3f
parent 2500 97fd83907c7c
equal deleted inserted replaced
2581:d94281cb835a 2582:87e502828b3f
  5358 	if (!(adapter->flags & FLAG_HAS_AMT))
  5358 	if (!(adapter->flags & FLAG_HAS_AMT))
  5359 		e1000_get_hw_control(adapter);
  5359 		e1000_get_hw_control(adapter);
  5360 
  5360 
  5361 	adapter->ecdev = ecdev_offer(netdev,ec_poll,THIS_MODULE);
  5361 	adapter->ecdev = ecdev_offer(netdev,ec_poll,THIS_MODULE);
  5362 	if (adapter->ecdev) {
  5362 	if (adapter->ecdev) {
  5363 		if (ecdev_open(adapter->ecdev)) {
  5363 		err = ecdev_open(adapter->ecdev);
       
  5364 		if (err) {
  5364 			ecdev_withdraw(adapter->ecdev);
  5365 			ecdev_withdraw(adapter->ecdev);
  5365 			goto err_register;
  5366 			goto err_register;
  5366 		}
  5367 		}
  5367 	} else {
  5368 	} else {
  5368 		strcpy(netdev->name, "eth%d");
  5369 		strcpy(netdev->name, "eth%d");