devices/e1000/e1000_main-2.6.18-ethercat.c
branchstable-1.5
changeset 2582 87e502828b3f
parent 2421 bc2d4bf9cbe5
equal deleted inserted replaced
2581:d94281cb835a 2582:87e502828b3f
   981 		e1000_get_hw_control(adapter);
   981 		e1000_get_hw_control(adapter);
   982 
   982 
   983 	// offer device to EtherCAT master module
   983 	// offer device to EtherCAT master module
   984 	adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE);
   984 	adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE);
   985 	if (adapter->ecdev) {
   985 	if (adapter->ecdev) {
   986 		if (ecdev_open(adapter->ecdev)) {
   986 		err = ecdev_open(adapter->ecdev);
       
   987 		if (err) {
   987 			ecdev_withdraw(adapter->ecdev);
   988 			ecdev_withdraw(adapter->ecdev);
   988 			goto err_register;
   989 			goto err_register;
   989 		}
   990 		}
   990 	} else {
   991 	} else {
   991 		strcpy(netdev->name, "eth%d");
   992 		strcpy(netdev->name, "eth%d");