* [PATCH net] ravb: fix result value overwrite
@ 2016-03-15 15:52 Yoshihiro Kaneko
2016-03-15 17:10 ` Sergei Shtylyov
2016-03-18 23:22 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Yoshihiro Kaneko @ 2016-03-15 15:52 UTC (permalink / raw)
To: netdev
Cc: David S. Miller, Sergei Shtylyov, Simon Horman, Magnus Damm,
linux-renesas-soc
The result value is overwritten by a return value of
ravb_ptp_interrupt().
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
---
This patch is based on the master branch of David Miller's networking tree.
drivers/net/ethernet/renesas/ravb_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 86449c3..d369af8 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -765,8 +765,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);
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] ravb: fix result value overwrite
2016-03-15 15:52 [PATCH net] ravb: fix result value overwrite Yoshihiro Kaneko
@ 2016-03-15 17:10 ` Sergei Shtylyov
2016-03-18 23:22 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Sergei Shtylyov @ 2016-03-15 17:10 UTC (permalink / raw)
To: Yoshihiro Kaneko, netdev
Cc: David S. Miller, Simon Horman, Magnus Damm, linux-renesas-soc
Hello.
On 03/15/2016 06:52 PM, Yoshihiro Kaneko wrote:
> 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>
[...]
> diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
> index 86449c3..d369af8 100644
> --- a/drivers/net/ethernet/renesas/ravb_main.c
> +++ b/drivers/net/ethernet/renesas/ravb_main.c
> @@ -765,8 +765,8 @@ static irqreturn_t ravb_interrupt(int irq, void *dev_id)
> result = IRQ_HANDLED;
> }
>
> - if (iss & ISS_CGIS)
> - result = ravb_ptp_interrupt(ndev);
I clearly meant to use |= here instead. Uh oh... :-(
> + if ((iss & ISS_CGIS) && ravb_ptp_interrupt(ndev) == IRQ_HANDLED)
> + result = IRQ_HANDLED;
MBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] ravb: fix result value overwrite
2016-03-15 15:52 [PATCH net] ravb: fix result value overwrite Yoshihiro Kaneko
2016-03-15 17:10 ` Sergei Shtylyov
@ 2016-03-18 23:22 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-03-18 23:22 UTC (permalink / raw)
To: ykaneko0929
Cc: netdev, sergei.shtylyov, horms, magnus.damm, linux-renesas-soc
From: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date: Wed, 16 Mar 2016 00:52:16 +0900
> The result value is overwritten by a return value of
> ravb_ptp_interrupt().
>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-18 23:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-15 15:52 [PATCH net] ravb: fix result value overwrite Yoshihiro Kaneko
2016-03-15 17:10 ` Sergei Shtylyov
2016-03-18 23:22 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).