---

yaml --- r: 351411 b: refs/heads/master c: 1860ac8 h: refs/heads/master i: 351409: f16583b 351407: 8b6a0a9 v: v3
git-mirror · Jan 16, 2013 · 94dc363 · 94dc363
1 parent ec8c3b5
commit 94dc363
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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;
 		}
 	}