From patchwork Tue Mar 15 15:52:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Kaneko X-Patchwork-Id: 8589951 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 389F5C0553 for ; Tue, 15 Mar 2016 15:52:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B5A12024C for ; Tue, 15 Mar 2016 15:52:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EFFB92021A for ; Tue, 15 Mar 2016 15:52:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752313AbcCOPwn (ORCPT ); Tue, 15 Mar 2016 11:52:43 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:33078 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751150AbcCOPwm (ORCPT ); Tue, 15 Mar 2016 11:52:42 -0400 Received: by mail-pf0-f182.google.com with SMTP id 124so34043055pfg.0; Tue, 15 Mar 2016 08:52:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=r3thgRo7Z9wc8huej06juYQ2pphYhamSwvBBSWEM1do=; b=kbdNm+mCbCjbZLFWC7YqwBp379akhgLQAuYMRz4xrfkSCp7yz9Ey3QeTcnLnoBQSkb ketq8iO/OukrBUzzoRE8NBSwobTKJiOyc1FL5s1V5bIir1gwBwT/CWv1M4bMS+QanPWV Ag7pjoYLEM8OWVnMpcWEJbOh0kIuA8hLEjy+BJ8wAK3+4bk3TCkjT8Jx/5+qmA4W5268 QjxaWvgdGo5dK2V7JzPP+QRSg0xNvPWE7I9pQ38mtP/Wh6t3jmWk4kfKeJgRV2qEgcvA PtJ+sp+TXBgGM3VjJkRmdRl0yv/pPd3JmxoGKT1bp/J+k4lYTmoO1poSPnJBR/NiQBz3 IDVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=r3thgRo7Z9wc8huej06juYQ2pphYhamSwvBBSWEM1do=; b=AW6qFq5c5jWoOBY4Dd2FGG8K3QjYWLn8CGsziS2+4tu60FrFxYSjlX5kVjlYz4cpKk CCKb0KX/K0zp6W8J92OttOu6ZDGl/WWD1qoe6wsHrakWKvAlUklTW27fvQ/8nNrRvP3w /NY5HlviM3EGohberKphNYb9Ujx8tbmuxi9u/g8Dn0+hkCV+WwwWnSjbPqsdFqzoaCYB 2ajzjymlKtOIGnWJlBKnU7Msh47YCzIENFBm9J+nUMV5TwOrYJG0Yv9As5xrB69rDqZk yCsqBTlE7SeJmrx7DD5fFD4i4nhdLRMOVdXu6KiMmGr4bbb7vxHMBbUKNrsScA0Q2LAs nzuA== X-Gm-Message-State: AD7BkJLNix+RwkKszmIlrvCYWxAg0uNaYlQD4tOy5L3eQjTTDIomOokFeDmCXyXfq8Rnbg== X-Received: by 10.67.5.68 with SMTP id ck4mr47073576pad.3.1458057162032; Tue, 15 Mar 2016 08:52:42 -0700 (PDT) Received: from localhost.localdomain (KD118152108246.ppp-bb.dion.ne.jp. [118.152.108.246]) by smtp.gmail.com with ESMTPSA id ta2sm40656634pab.42.2016.03.15.08.52.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Mar 2016 08:52:41 -0700 (PDT) From: Yoshihiro Kaneko To: netdev@vger.kernel.org Cc: "David S. Miller" , Sergei Shtylyov , Simon Horman , Magnus Damm , linux-renesas-soc@vger.kernel.org Subject: [PATCH net] ravb: fix result value overwrite Date: Wed, 16 Mar 2016 00:52:16 +0900 Message-Id: <1458057136-23253-1-git-send-email-ykaneko0929@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The result value is overwritten by a return value of ravb_ptp_interrupt(). Signed-off-by: Yoshihiro Kaneko Acked-by: Sergei Shtylyov --- 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);