From patchwork Thu Jan 29 15:12:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roel kluin X-Patchwork-Id: 21014 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 29905DE095 for ; Fri, 30 Jan 2009 02:12:14 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753902AbZA2PMJ (ORCPT ); Thu, 29 Jan 2009 10:12:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752779AbZA2PMH (ORCPT ); Thu, 29 Jan 2009 10:12:07 -0500 Received: from ey-out-2122.google.com ([74.125.78.24]:17228 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751863AbZA2PMF (ORCPT ); Thu, 29 Jan 2009 10:12:05 -0500 Received: by ey-out-2122.google.com with SMTP id 25so209686eya.37 for ; Thu, 29 Jan 2009 07:12:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=81odHPX3AQrPQma2KUkCpkhrB9JW64NCr9h6IOHF8gE=; b=dTcFT4oCxJaE+SOg2pAsjMTxnP7bCfOzwa3DywJLmLdGW4027bID4lSUmjlP0HwDxA RgFCWlNn/ADXJy4KZQduDAPZJQkd0fBr6UfnZ8HlLpAksbacm9P6GouzPMNpK872BBDu 6W0SIq4aggMUrsTPVq/Ueyh1kU6pU0oGavST8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=g/BYqXF+7llx/bQDmgw6Iv9mr6vv07omQ7n/kDuTaWIj07qz/Gl2rqSKdSI1Q7nXvG OZIiW46OF5cTdwfYkIPirURB08idAakJin4g2WywZZ7vrG+3ZneIL/fjRlp8UwqP4UZe XDIGwMdRVRKY6IG+MQC1+ye0cMuitnXF04RTs= Received: by 10.66.216.7 with SMTP id o7mr1005064ugg.83.1233241923496; Thu, 29 Jan 2009 07:12:03 -0800 (PST) Received: from ?192.168.1.115? (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id j4sm9342287ugf.16.2009.01.29.07.12.02 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 29 Jan 2009 07:12:02 -0800 (PST) Message-ID: <4981C743.90202@gmail.com> Date: Thu, 29 Jan 2009 16:12:03 +0100 From: Roel Kluin User-Agent: Thunderbird 2.0.0.18 (X11/20081105) MIME-Version: 1.0 To: steve.glendinning@smsc.com CC: netdev@vger.kernel.org Subject: [PATCH] smsc911x: timeout reaches -1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org With a postfix decrement the timeout will reach -1 rather than 0, so the warning will not be issued. Signed-off-by: Roel Kluin Acked-by: Steve Glendinning --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index f513bdf..783c1a7 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c @@ -953,7 +953,7 @@ smsc911x_rx_fastforward(struct smsc911x_data *pdata, unsigned int pktbytes) do { udelay(1); val = smsc911x_reg_read(pdata, RX_DP_CTRL); - } while (timeout-- && (val & RX_DP_CTRL_RX_FFWD_)); + } while (--timeout && (val & RX_DP_CTRL_RX_FFWD_)); if (unlikely(timeout == 0)) SMSC_WARNING(HW, "Timed out waiting for "