devices/r8169-3.6-ethercat.c
branchstable-1.5
changeset 2582 87e502828b3f
parent 2547 5b349a0b1e2b
equal deleted inserted replaced
2581:d94281cb835a 2582:87e502828b3f
  7102 	device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);
  7102 	device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);
  7103 
  7103 
  7104 	if (pci_dev_run_wake(pdev))
  7104 	if (pci_dev_run_wake(pdev))
  7105 		pm_runtime_put_noidle(&pdev->dev);
  7105 		pm_runtime_put_noidle(&pdev->dev);
  7106 
  7106 
  7107 	netif_carrier_off(dev);
  7107 	if (tp->ecdev) {
  7108 
  7108 		rc = ecdev_open(tp->ecdev);
  7109 	if (tp->ecdev && ecdev_open(tp->ecdev)) {
  7109 		if (rc) {
  7110 		ecdev_withdraw(tp->ecdev);
  7110 			ecdev_withdraw(tp->ecdev);
  7111 		goto err_out_msi_4;
  7111 			goto err_out_msi_4;
       
  7112 		}
       
  7113 	}
       
  7114 	else {
       
  7115 		netif_carrier_off(dev);
  7112 	}
  7116 	}
  7113 
  7117 
  7114 out:
  7118 out:
  7115 	return rc;
  7119 	return rc;
  7116 
  7120