ravb: fix result value overwrite

The result value is overwritten by a return value of
ravb_ptp_interrupt().

Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 8f2c4fb4c7246d6cae26e09c33a31c0573c85b00..4e1a7dba7c4abb50eae3a82d729ce6656cdc4bbd 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -757,8 +757,8 @@ static irqreturn_t ravb_interrupt(int irq, void *dev_id)
                result = IRQ_HANDLED;
        }
 
-       if (iss & ISS_CGIS)
-               result = ravb_ptp_interrupt(ndev);
+       if ((iss & ISS_CGIS) && ravb_ptp_interrupt(ndev) == IRQ_HANDLED)
+               result = IRQ_HANDLED;
 
        mmiowb();
        spin_unlock(&priv->lock);