mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
e1000e: Minor flow correction in e1000_shutdown function
[ Upstream commit662200e324
] Add curly braces to avoid entering to an if statement where it is not always required in e1000_shutdown function. This improves code readability and might prevent non-deterministic behaviour in the future. Signed-off-by: Vitaly Lifshits <vitaly.lifshits@intel.com> Tested-by: Naama Meir <naamax.meir@linux.intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Link: https://lore.kernel.org/r/20240301184806.2634508-5-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Stable-dep-of:861e808602
("e1000e: move force SMBUS from enable ulp function to avoid PHY loss issue") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
1d16cd91cd
commit
eb96a5c025
1 changed files with 4 additions and 4 deletions
|
@ -6688,14 +6688,14 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
|
||||||
if (adapter->hw.phy.type == e1000_phy_igp_3) {
|
if (adapter->hw.phy.type == e1000_phy_igp_3) {
|
||||||
e1000e_igp3_phy_powerdown_workaround_ich8lan(&adapter->hw);
|
e1000e_igp3_phy_powerdown_workaround_ich8lan(&adapter->hw);
|
||||||
} else if (hw->mac.type >= e1000_pch_lpt) {
|
} else if (hw->mac.type >= e1000_pch_lpt) {
|
||||||
if (wufc && !(wufc & (E1000_WUFC_EX | E1000_WUFC_MC | E1000_WUFC_BC)))
|
if (wufc && !(wufc & (E1000_WUFC_EX | E1000_WUFC_MC | E1000_WUFC_BC))) {
|
||||||
/* ULP does not support wake from unicast, multicast
|
/* ULP does not support wake from unicast, multicast
|
||||||
* or broadcast.
|
* or broadcast.
|
||||||
*/
|
*/
|
||||||
retval = e1000_enable_ulp_lpt_lp(hw, !runtime);
|
retval = e1000_enable_ulp_lpt_lp(hw, !runtime);
|
||||||
|
if (retval)
|
||||||
if (retval)
|
return retval;
|
||||||
return retval;
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Ensure that the appropriate bits are set in LPI_CTRL
|
/* Ensure that the appropriate bits are set in LPI_CTRL
|
||||||
|
|
Loading…
Reference in a new issue