From patchwork Wed Nov 24 12:24:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomoya X-Patchwork-Id: 72862 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 73527B6EF0 for ; Wed, 24 Nov 2010 23:25:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754487Ab0KXMZR (ORCPT ); Wed, 24 Nov 2010 07:25:17 -0500 Received: from sm-d311v.smileserver.ne.jp ([203.211.202.206]:3103 "EHLO sm-d311v.smileserver.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754234Ab0KXMZQ (ORCPT ); Wed, 24 Nov 2010 07:25:16 -0500 X-Virus-Status: clean(F-Secure/virusgw_smtp/403/viruscheck1-00.private.hosting-pf.net) Message-ID: <4CED0412.60305@dsn.okisemi.com> Date: Wed, 24 Nov 2010 21:24:50 +0900 From: Tomoya MORINAGA User-Agent: Mozilla/5.0 (X11; U; Linux i686; ja; rv:1.9.1.15) Gecko/20101027 Thunderbird/3.0.10 MIME-Version: 1.0 To: Wolfgang Grandegger , Wolfram Sang , Christian Pellegrin , Barry Song <21cnbao@gmail.com>, Samuel Ortiz , socketcan-core@lists.berlios.de, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" CC: qi.wang@intel.com, yong.y.wang@intel.com, andrew.chih.howe.khor@intel.com, joel.clark@intel.com, kok.howg.ewe@intel.com, margie.foster@intel.com Subject: [PATCH net-next-2.6 16/17 v3] can: EG20T PCH: Fix incorrect return processing Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix incorrect return processing Signed-off-by: Tomoya MORINAGA --- drivers/net/can/pch_can.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) static void pch_fifo_thresh(struct pch_can_priv *priv, int obj_id) @@ -674,7 +676,7 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota) if (reg & PCH_IF_MCONT_MSGLOST) { rtn = pch_can_rx_msg_lost(ndev, obj_num); if (!rtn) - return rtn; + return rcv_pkts; rcv_pkts++; quota--; obj_num++; @@ -777,10 +779,12 @@ static int pch_can_poll(struct napi_struct *napi, int quota) goto end; if ((int_stat >= PCH_RX_OBJ_START) && (int_stat <= PCH_RX_OBJ_END)) { - rcv_pkts += pch_can_rx_normal(ndev, int_stat, quota); - quota -= rcv_pkts; - if (quota < 0) + rcv_pkts = pch_can_rx_normal(ndev, int_stat, quota); + if (rcv_pkts < 0) { + rcv_pkts = 0; goto end; + } + quota -= rcv_pkts; } else if ((int_stat >= PCH_TX_OBJ_START) && (int_stat <= PCH_TX_OBJ_END)) { /* Handle transmission interrupt */ diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c index c612a99..48f4a2e 100644 --- a/drivers/net/can/pch_can.c +++ b/drivers/net/can/pch_can.c @@ -589,10 +589,12 @@ static irqreturn_t pch_can_interrupt(int irq, void *dev_id) struct net_device *ndev = (struct net_device *)dev_id; struct pch_can_priv *priv = netdev_priv(ndev); - pch_can_set_int_enables(priv, PCH_CAN_NONE); - napi_schedule(&priv->napi); - - return IRQ_HANDLED; + if ((pch_can_int_pending(priv) > 0) && (dev_id != NULL)) { + pch_can_set_int_enables(priv, PCH_CAN_NONE); + napi_schedule(&priv->napi); + return IRQ_HANDLED; + } + return IRQ_NONE; }