Re: [PATCH net] ravb: fix result value overwrite

[Sergei Shtylyov <sergei.shtylyov@xxxxxxxxxxxxxxxxxx>]

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@xxxxxxxxx>
> ---

Acked-by: Sergei Shtylyov <sergei.shtylyov@xxxxxxxxxxxxxxxxxx>

[...]

> 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