pch_can: Fix incorrect return processing
Tomoya [Sun, 12 Dec 2010 20:24:23 +0000 (20:24 +0000)]
Fix incorrect return processing.

Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/can/pch_can.c

index ace1fe7..8efbe35 100644 (file)
@@ -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)