* Nishant Kamat <nskamat@xxxxxx> [080502 04:26]:
> Due to incorrect decrement operation in the loop, the timeout
> value would never be zero in case of hardware error. This patch
> fixes the decrement operation.
And this too.
Tony
> Signed-off-by: Nishant Kamat <nskamat@xxxxxx>
> ---
> drivers/net/smc911x.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
> index 14a0e3a..e5afcf2 100644
> --- a/drivers/net/smc911x.c
> +++ b/drivers/net/smc911x.c
> @@ -243,7 +243,7 @@ static void smc911x_reset(struct net_device *dev)
> do {
> udelay(10);
> reg = SMC_GET_PMT_CTRL() & PMT_CTRL_READY_;
> - } while ( timeout-- && !reg);
> + } while (--timeout && !reg);
> if (timeout == 0) {
> PRINTK("%s: smc911x_reset timeout waiting for PM restore\n", dev->name);
> return;
> @@ -267,7 +267,7 @@ static void smc911x_reset(struct net_device *dev)
> resets++;
> break;
> }
> - } while ( timeout-- && (reg & HW_CFG_SRST_));
> + } while (--timeout && (reg & HW_CFG_SRST_));
> }
> if (timeout == 0) {
> PRINTK("%s: smc911x_reset timeout waiting for reset\n", dev->name);
> @@ -276,7 +276,7 @@ static void smc911x_reset(struct net_device *dev)
>
> /* make sure EEPROM has finished loading before setting GPIO_CFG */
> timeout=1000;
> - while ( timeout-- && (SMC_GET_E2P_CMD() & E2P_CMD_EPC_BUSY_)) {
> + while (--timeout && (SMC_GET_E2P_CMD() & E2P_CMD_EPC_BUSY_)) {
> udelay(10);
> }
> if (timeout == 0){
> @@ -413,7 +413,7 @@ static inline void smc911x_drop_pkt(struct net_device *dev)
> do {
> udelay(10);
> reg = SMC_GET_RX_DP_CTRL() & RX_DP_CTRL_FFWD_BUSY_;
> - } while ( timeout-- && reg);
> + } while (--timeout && reg);
> if (timeout == 0) {
> PRINTK("%s: timeout waiting for RX fast forward\n", dev->name);
> }
> --
> 1.5.3.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
