From a788d13bca7b1ca0d7b5d8f3f207a71a56238146 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Wed, 8 Feb 2012 02:55:51 +0000 Subject: [PATCH] --- yaml --- r: 290125 b: refs/heads/master c: 2a31b37a8956154df099400ba93cd6898a629c6d h: refs/heads/master i: 290123: 24c1bfae1829147ccef0218f68919b63a497f002 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000e/mac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b856fec9f762..6fdaa64eed28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e561a705a61e8d4c32a1259c611703a3976347aa +refs/heads/master: 2a31b37a8956154df099400ba93cd6898a629c6d diff --git a/trunk/drivers/net/ethernet/intel/e1000e/mac.c b/trunk/drivers/net/ethernet/intel/e1000e/mac.c index b3b2f9e567ff..943b9090fda0 100644 --- a/trunk/drivers/net/ethernet/intel/e1000e/mac.c +++ b/trunk/drivers/net/ethernet/intel/e1000e/mac.c @@ -922,7 +922,7 @@ s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw) e_dbg("No signal detected\n"); } - return 0; + return ret_val; } /**