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