devices/e1000/e1000_main-2.6.24-ethercat.c
changeset 1011 a0759d0dded4
parent 898 9fe5df8b3a98
child 1152 30f168c7f74f
equal deleted inserted replaced
1010:6672b86e7b10 1011:a0759d0dded4
  1165 	if (adapter->hw.mac_type != e1000_82573 ||
  1165 	if (adapter->hw.mac_type != e1000_82573 ||
  1166 	    !e1000_check_mng_mode(&adapter->hw))
  1166 	    !e1000_check_mng_mode(&adapter->hw))
  1167 		e1000_get_hw_control(adapter);
  1167 		e1000_get_hw_control(adapter);
  1168 
  1168 
  1169 	// offer device to EtherCAT master module
  1169 	// offer device to EtherCAT master module
  1170 	if (ecdev_offer(netdev, ec_poll, THIS_MODULE, &adapter->ecdev)) {
  1170 	adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE);
  1171 		DPRINTK(PROBE, ERR, "Failed to offer device.\n");
       
  1172 		goto err_register;
       
  1173 	}
       
  1174 
       
  1175 	if (adapter->ecdev) {
  1171 	if (adapter->ecdev) {
  1176 		if (ecdev_open(adapter->ecdev)) {
  1172 		if (ecdev_open(adapter->ecdev)) {
  1177 			ecdev_withdraw(adapter->ecdev);
  1173 			ecdev_withdraw(adapter->ecdev);
  1178 			goto err_register;
  1174 			goto err_register;
  1179 		}
  1175 		}