devices/e1000/e1000_main-2.6.20-ethercat.c
branchstable-1.5
changeset 2582 87e502828b3f
parent 2471 fc64a4b1ec1a
equal deleted inserted replaced
2581:d94281cb835a 2582:87e502828b3f
  1188 		e1000_get_hw_control(adapter);
  1188 		e1000_get_hw_control(adapter);
  1189 
  1189 
  1190 	// offer device to EtherCAT master module
  1190 	// offer device to EtherCAT master module
  1191 	adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE);
  1191 	adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE);
  1192 	if (adapter->ecdev) {
  1192 	if (adapter->ecdev) {
  1193 		if (ecdev_open(adapter->ecdev)) {
  1193 		err = ecdev_open(adapter->ecdev);
       
  1194 		if (err) {
  1194 			ecdev_withdraw(adapter->ecdev);
  1195 			ecdev_withdraw(adapter->ecdev);
  1195 			goto err_register;
  1196 			goto err_register;
  1196 		}
  1197 		}
  1197 	} else {
  1198 	} else {
  1198 		strcpy(netdev->name, "eth%d");
  1199 		strcpy(netdev->name, "eth%d");