From: Sergei Shtylyov Date: Wed, 5 Jun 2013 19:54:01 +0000 (+0400) Subject: sh_eth: fix result of sh_eth_check_reset() on timeout X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9f8c4265bda4a6e9aa97041d5cfd91386f460b65;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git sh_eth: fix result of sh_eth_check_reset() on timeout When the first loop in sh_eth_check_reset() runs to its end, 'cnt' is 0, so the following check for 'cnt < 0' fails to catch the timeout. Fix the condition in this check, so that the timeout is actually reported. While at it, fix the grammar in the failure message... Signed-off-by: Sergei Shtylyov Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 42e9dd05c93..b4479b5aaee 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -897,8 +897,8 @@ static int sh_eth_check_reset(struct net_device *ndev) mdelay(1); cnt--; } - if (cnt < 0) { - pr_err("Device reset fail\n"); + if (cnt <= 0) { + pr_err("Device reset failed\n"); ret = -ETIMEDOUT; } return ret;