diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-25 19:20:38 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-25 19:20:38 -0800 |
commit | 041110a439e21cd40709ead4ffbfa8034619ad77 (patch) | |
tree | 4d9f792625a61fa26bc5085f0bfab6208f1ff0ec /drivers/net/e1000e/lib.c | |
parent | a1a5da57d0884017b8c3a011a28d4f5e08a2ea4f (diff) | |
parent | 2316aa2aee254c126e688b53a3a105b82bc3f368 (diff) | |
download | op-kernel-dev-041110a439e21cd40709ead4ffbfa8034619ad77.zip op-kernel-dev-041110a439e21cd40709ead4ffbfa8034619ad77.tar.gz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/e1000e/lib.c')
-rw-r--r-- | drivers/net/e1000e/lib.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index 8377523..7e55170 100644 --- a/drivers/net/e1000e/lib.c +++ b/drivers/net/e1000e/lib.c @@ -493,9 +493,8 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw) * different link partner. */ ret_val = e1000e_config_fc_after_link_up(hw); - if (ret_val) { + if (ret_val) e_dbg("Error configuring flow control\n"); - } return ret_val; } @@ -1496,9 +1495,8 @@ s32 e1000e_setup_led_generic(struct e1000_hw *hw) { u32 ledctl; - if (hw->mac.ops.setup_led != e1000e_setup_led_generic) { + if (hw->mac.ops.setup_led != e1000e_setup_led_generic) return -E1000_ERR_CONFIG; - } if (hw->phy.media_type == e1000_media_type_fiber) { ledctl = er32(LEDCTL); |