devices/r8169-2.6.33-ethercat.c
branchstable-1.5
changeset 2582 87e502828b3f
parent 2421 bc2d4bf9cbe5
equal deleted inserted replaced
2581:d94281cb835a 2582:87e502828b3f
  3232 	if (tp->mac_version == RTL_GIGA_MAC_VER_05)
  3232 	if (tp->mac_version == RTL_GIGA_MAC_VER_05)
  3233 		RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) | RxVlan);
  3233 		RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) | RxVlan);
  3234 
  3234 
  3235 	device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);
  3235 	device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);
  3236 
  3236 
  3237 	if (tp->ecdev && ecdev_open(tp->ecdev)) {
  3237 	if (tp->ecdev) {
  3238 		ecdev_withdraw(tp->ecdev);
  3238 		rc = ecdev_open(tp->ecdev);
  3239 		goto err_out_msi_5;
  3239 		if (rc) {
       
  3240 			ecdev_withdraw(tp->ecdev);
       
  3241 			goto err_out_msi_5;
       
  3242 		}
  3240 	}
  3243 	}
  3241 
  3244 
  3242 out:
  3245 out:
  3243 	return rc;
  3246 	return rc;
  3244 
  3247