devices/r8169-2.6.37-ethercat.c
branchstable-1.5
changeset 2582 87e502828b3f
parent 2251 5023ce75fe91
equal deleted inserted replaced
2581:d94281cb835a 2582:87e502828b3f
  3254 	device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);
  3254 	device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);
  3255 
  3255 
  3256 	if (pci_dev_run_wake(pdev))
  3256 	if (pci_dev_run_wake(pdev))
  3257 		pm_runtime_put_noidle(&pdev->dev);
  3257 		pm_runtime_put_noidle(&pdev->dev);
  3258 
  3258 
  3259 	if (!tp->ecdev) {
  3259 	if (tp->ecdev) {
       
  3260 		rc = ecdev_open(tp->ecdev);
       
  3261 		if (rc) {
       
  3262 			ecdev_withdraw(tp->ecdev);
       
  3263 			goto err_out_msi_4;
       
  3264 		}
       
  3265 	}
       
  3266 	else {
  3260 		netif_carrier_off(dev);
  3267 		netif_carrier_off(dev);
  3261 	}
       
  3262 
       
  3263 	if (tp->ecdev && ecdev_open(tp->ecdev)) {
       
  3264 		ecdev_withdraw(tp->ecdev);
       
  3265 		goto err_out_msi_4;
       
  3266 	}
  3268 	}
  3267 
  3269 
  3268 out:
  3270 out:
  3269 	return rc;
  3271 	return rc;
  3270 
  3272