[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <949a3bd7-7b65-8a9e-c535-6fafeb06f1a2@users.sourceforge.net>
Date: Mon, 17 Apr 2017 17:29:04 +0200
From: SF Markus Elfring <elfring@...rs.sourceforge.net>
To: netdev@...r.kernel.org, "David S. Miller" <davem@...emloft.net>,
Florian Fainelli <f.fainelli@...il.com>,
Jarod Wilson <jarod@...hat.com>,
Jisheng Zhang <jszhang@...vell.com>,
Mirko Lindner <mlindner@...vell.com>,
Philippe Reynes <tremyfr@...il.com>,
Russell King <rmk+kernel@...linux.org.uk>,
Sergei Shtylyov <sergei.shtylyov@...entembedded.com>,
Stephen Hemminger <stephen@...workplumber.org>,
Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>
Cc: LKML <linux-kernel@...r.kernel.org>,
kernel-janitors@...r.kernel.org
Subject: [PATCH 19/25] net: mvpp2: Rename a jump label in mvpp2_prs_vlan_add()
From: Markus Elfring <elfring@...rs.sourceforge.net>
Date: Mon, 17 Apr 2017 13:50:35 +0200
Adjust jump labels according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
---
drivers/net/ethernet/marvell/mvpp2.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c
index 0c190bd003b1..3bdd3f1fe34e 100644
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -2021,7 +2021,7 @@ static int mvpp2_prs_vlan_add(struct mvpp2 *priv, unsigned short tpid, int ai,
if (tid <= tid_aux) {
ret = -EINVAL;
- goto error;
+ goto free_pe;
}
memset(pe, 0, sizeof(*pe));
@@ -2053,8 +2053,7 @@ static int mvpp2_prs_vlan_add(struct mvpp2 *priv, unsigned short tpid, int ai,
mvpp2_prs_tcam_port_map_set(pe, port_map);
mvpp2_prs_hw_write(priv, pe);
-
-error:
+free_pe:
kfree(pe);
return ret;
--
2.12.2
Powered by blists - more mailing lists