devices/e1000/e1000_main-2.6.29-ethercat.c
branchstable-1.5
changeset 2582 87e502828b3f
parent 2471 fc64a4b1ec1a
equal deleted inserted replaced
2581:d94281cb835a 2582:87e502828b3f
  1246 		e1000_get_hw_control(adapter);
  1246 		e1000_get_hw_control(adapter);
  1247 
  1247 
  1248 	// offer device to EtherCAT master module
  1248 	// offer device to EtherCAT master module
  1249 	adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE);
  1249 	adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE);
  1250 	if (adapter->ecdev) {
  1250 	if (adapter->ecdev) {
  1251 		if (ecdev_open(adapter->ecdev)) {
  1251 		err = ecdev_open(adapter->ecdev);
       
  1252 		if (err) {
  1252 			ecdev_withdraw(adapter->ecdev);
  1253 			ecdev_withdraw(adapter->ecdev);
  1253 			goto err_register;
  1254 			goto err_register;
  1254 		}
  1255 		}
  1255 	} else {
  1256 	} else {
  1256 		/* tell the stack to leave us alone until e1000_open() is called */
  1257 		/* tell the stack to leave us alone until e1000_open() is called */