summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/intel/igc/igc_ethtool.c
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2021-02-02 14:21:31 -0800
committerJakub Kicinski <kuba@kernel.org>2021-02-02 14:21:31 -0800
commitd1e1355aefcc0cbda750a8931e93e1e04a5b0b6a (patch)
treef43b81751cb5c5736268057ecdbcdb99dd00e826 /drivers/net/ethernet/intel/igc/igc_ethtool.c
parent9ae4bdc6e4c1281ddf8d6335bea35864d086cbf9 (diff)
parent3aaf0a27ffc29b19a62314edd684b9bc6346f9a8 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/intel/igc/igc_ethtool.c')
-rw-r--r--drivers/net/ethernet/intel/igc/igc_ethtool.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c
index 831f2f09de5f..ec8cd69d4992 100644
--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c
+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c
@@ -1714,7 +1714,8 @@ static int igc_ethtool_get_link_ksettings(struct net_device *netdev,
Asym_Pause);
}
- status = rd32(IGC_STATUS);
+ status = pm_runtime_suspended(&adapter->pdev->dev) ?
+ 0 : rd32(IGC_STATUS);
if (status & IGC_STATUS_LU) {
if (status & IGC_STATUS_SPEED_1000) {