diff options
| author | Yoshihiro Kaneko <ykaneko0929@gmail.com> | 2016-03-16 00:52:16 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-18 19:16:33 -0400 |
| commit | 38c848c73180fb1d142a39e664b6d9663751f6b2 (patch) | |
| tree | 64fb6be6f3704ed1a9756db48ccfaa281b136f2b /drivers/net | |
| parent | 2c9a266afefe137bff06bbe0fc48b4d3b3cb348c (diff) | |
| download | linux-38c848c73180fb1d142a39e664b6d9663751f6b2.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/renesas/ravb_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 8f2c4fb4c724..4e1a7dba7c4a 100644 --- 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); |