Commit-ID: 0fdf4d096102464e290d5ccaee8ad0cee7bd9e8a Gitweb: http://git.kernel.org/tip/0fdf4d096102464e290d5ccaee8ad0cee7bd9e8a Author: Eric Dumazet <eric.dumazet@xxxxxxxxx> AuthorDate: Thu, 26 Aug 2010 22:03:53 -0700 Committer: David S. Miller <davem@xxxxxxxxxxxxx> CommitDate: Thu, 26 Aug 2010 22:03:53 -0700 bnx2x: fix wrong return from bnx2x_trylock_hw_lock bnx2x_trylock_hw_lock() returns a bool : true if succeeded to acquire the lock. false in case of error. -EINVAL is not an acceptable value, since its promoted to true. Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx> Acked-by: Eilon Greenstein <eilong@xxxxxxxxxxxx> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> --- drivers/net/bnx2x/bnx2x_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index 05a08d1..7fb9a61 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c @@ -781,7 +781,7 @@ static bool bnx2x_trylock_hw_lock(struct bnx2x *bp, u32 resource) DP(NETIF_MSG_HW, "resource(0x%x) > HW_LOCK_MAX_RESOURCE_VALUE(0x%x)\n", resource, HW_LOCK_MAX_RESOURCE_VALUE); - return -EINVAL; + return false; } if (func <= 5) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html