aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2012-12-05 01:26:40 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-01-16 03:32:12 -0500
commit1860ac84613877f9ec8a1235e04190e26dd06514 (patch)
tree5f5d0eb4968921dfd564d93389aa5970d768020d
parent2a2293b9510f05f963422121109b8ec3b9ee9f9f (diff)
e1000e: cleanup unnecessary line wrap
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/e1000e/param.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index 89d536dd7ff5..b29a8a5116a8 100644
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -447,8 +447,7 @@ void e1000e_check_options(struct e1000_adapter *adapter)
447 if (num_SmartPowerDownEnable > bd) { 447 if (num_SmartPowerDownEnable > bd) {
448 unsigned int spd = SmartPowerDownEnable[bd]; 448 unsigned int spd = SmartPowerDownEnable[bd];
449 e1000_validate_option(&spd, &opt, adapter); 449 e1000_validate_option(&spd, &opt, adapter);
450 if ((adapter->flags & FLAG_HAS_SMART_POWER_DOWN) 450 if ((adapter->flags & FLAG_HAS_SMART_POWER_DOWN) && spd)
451 && spd)
452 adapter->flags |= FLAG_SMART_POWER_DOWN; 451 adapter->flags |= FLAG_SMART_POWER_DOWN;
453 } 452 }
454 } 453 }