From 94dc3630c4fd68957099b605121f4f075015a752 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Wed, 5 Dec 2012 06:26:40 +0000 Subject: [PATCH] --- yaml --- r: 351411 b: refs/heads/master c: 1860ac84613877f9ec8a1235e04190e26dd06514 h: refs/heads/master i: 351409: f16583b1aa0c17ac2c988757b78f04f5b66e3286 351407: 8b6a0a9bb44a2dd418856485c1a6b77e75fb09f0 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000e/param.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 11c27cbbc53c..73c8ca698619 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a2293b9510f05f963422121109b8ec3b9ee9f9f +refs/heads/master: 1860ac84613877f9ec8a1235e04190e26dd06514 diff --git a/trunk/drivers/net/ethernet/intel/e1000e/param.c b/trunk/drivers/net/ethernet/intel/e1000e/param.c index 89d536dd7ff5..b29a8a5116a8 100644 --- a/trunk/drivers/net/ethernet/intel/e1000e/param.c +++ b/trunk/drivers/net/ethernet/intel/e1000e/param.c @@ -447,8 +447,7 @@ void e1000e_check_options(struct e1000_adapter *adapter) if (num_SmartPowerDownEnable > bd) { unsigned int spd = SmartPowerDownEnable[bd]; e1000_validate_option(&spd, &opt, adapter); - if ((adapter->flags & FLAG_HAS_SMART_POWER_DOWN) - && spd) + if ((adapter->flags & FLAG_HAS_SMART_POWER_DOWN) && spd) adapter->flags |= FLAG_SMART_POWER_DOWN; } }