diff options
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 7acc61e4f645..745c1242a2d9 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -7003,7 +7003,7 @@ static int e1000_set_features(struct net_device *netdev, | |||
7003 | else | 7003 | else |
7004 | e1000e_reset(adapter); | 7004 | e1000e_reset(adapter); |
7005 | 7005 | ||
7006 | return 0; | 7006 | return 1; |
7007 | } | 7007 | } |
7008 | 7008 | ||
7009 | static const struct net_device_ops e1000e_netdev_ops = { | 7009 | static const struct net_device_ops e1000e_netdev_ops = { |
@@ -7350,7 +7350,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
7350 | 7350 | ||
7351 | dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP); | 7351 | dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP); |
7352 | 7352 | ||
7353 | if (pci_dev_run_wake(pdev)) | 7353 | if (pci_dev_run_wake(pdev) && hw->mac.type < e1000_pch_cnp) |
7354 | pm_runtime_put_noidle(&pdev->dev); | 7354 | pm_runtime_put_noidle(&pdev->dev); |
7355 | 7355 | ||
7356 | return 0; | 7356 | return 0; |