diff options
| author | Tomoya <tomoya-linux@dsn.okisemi.com> | 2010-12-12 20:24:23 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-13 12:24:27 -0800 |
| commit | 3332bc5446e034566e8a56bf7a7cd479ca35bd6d (patch) | |
| tree | 05ca7dffb9bb91ccf5a3d7a895dacafe7afcc3b9 | |
| parent | a6f6d6b51b110e661ae5f862d60c27da4970bec6 (diff) | |
pch_can: Fix incorrect return processing
Fix incorrect return processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/can/pch_can.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c index ace1fe790ce..8efbe359ba2 100644 --- a/drivers/net/can/pch_can.c +++ b/drivers/net/can/pch_can.c @@ -580,9 +580,11 @@ 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); + if (!pch_can_int_pending(priv)) + return IRQ_NONE; + pch_can_set_int_enables(priv, PCH_CAN_NONE); napi_schedule(&priv->napi); - return IRQ_HANDLED; } @@ -671,8 +673,10 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota) } skb = alloc_can_skb(priv->ndev, &cf); - if (!skb) - return -ENOMEM; + if (!skb) { + netdev_err(ndev, "alloc_can_skb Failed\n"); + return rcv_pkts; + } /* Get Received data */ id2 = ioread32(&priv->regs->ifregs[0].id2); @@ -733,8 +737,8 @@ static int pch_can_poll(struct napi_struct *napi, int quota) struct net_device *ndev = napi->dev; struct pch_can_priv *priv = netdev_priv(ndev); u32 int_stat; - int rcv_pkts = 0; u32 reg_stat; + int quota_save = quota; int_stat = pch_can_int_pending(priv); if (!int_stat) @@ -763,10 +767,7 @@ 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) - goto end; + quota -= pch_can_rx_normal(ndev, int_stat, quota); } else if ((int_stat >= PCH_TX_OBJ_START) && (int_stat <= PCH_TX_OBJ_END)) { /* Handle transmission interrupt */ @@ -777,7 +778,7 @@ end: napi_complete(napi); pch_can_set_int_enables(priv, PCH_CAN_ALL); - return rcv_pkts; + return quota_save - quota; } static int pch_set_bittiming(struct net_device *ndev) |