From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752599AbdLJPdP (ORCPT ); Sun, 10 Dec 2017 10:33:15 -0500 Received: from mout.web.de ([212.227.15.3]:49724 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752565AbdLJPdK (ORCPT ); Sun, 10 Dec 2017 10:33:10 -0500 Subject: [PATCH 2/2] tty: moxa: Return directly after a failed kcalloc() in moxa_init_board() From: SF Markus Elfring To: kernel-janitors@vger.kernel.org, Greg Kroah-Hartman , Jiri Slaby Cc: LKML References: <7d1badbd-8bb1-4109-5c40-1ba1f226a2b1@users.sourceforge.net> Message-ID: <385897ca-48ec-770a-8217-844fe65285f3@users.sourceforge.net> Date: Sun, 10 Dec 2017 16:32:31 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <7d1badbd-8bb1-4109-5c40-1ba1f226a2b1@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:CWExMr1xglkScIoN8iyCgIWWq06TFLCOw+Yo6qeuH8+lFuRGNzP lCFnGnG08aJyA9X/E2e84KDbMz/DfPflK/2pA6l1epna8pOZS+goARfyboHsWRJZcSNHwEx 1zZ/uDY0dDlGHIv2PphLczXgwMwfyqZVcSq9AtISTJ0KXJYAJuxXSCtvACDEIV4UBA/YzUx O0iebbqBoJY5syJleS0xA== X-UI-Out-Filterresults: notjunk:1;V01:K0:jpHGjQI3aaQ=:2uOOnVj9lJVg+WThU1aDJ6 B4VudSmObVVlMxvtrotlYwGNOvXeEVyLjHf97xpwARLg9jUAFjBthMfqUF0qivPnTosHnU5GT /40TfCOUjT8hSA58Cy3fgFr1ZXAxDLCJ8VlwKBHlEQbHP4qmparrJju390CJ00Ay4H0y4/4LF RO1yVG5Kc3D6tJ0u5+Bwi8ImKzPLu5/3ZaF6YTr3mdmkXLWR9ZkAm7YepI7g/3NOous+/sM34 7nUFgFv6BNwgrJnNIw+8uAUVLHCfdEzQeZFJ4Oa6/c5KcdeolzSJyOayM/RiiQ3ARHTGSvPhR evi127ZfTOuIwl6LQiBq0SC8KMB8zUAbclIGJdzcju2pduv08hq7dxNnQhfyv53/QorwSYD1Y HLjQJsqi1MS3gj7JJiiKqu8NuMXWLZd4Eq3JBjWnrgxMLYNLdCQokhwTIRWXav0b/XfqNC5KF LLq+eobgKnnfMGR8Hy0gQwxI/7oX9siZE9bgUsTYPEfoTocS2oRsH0xqdM5g+iMtt9+vuOGOp GSEKIL3yUvxLjOHlgkIgkFWb/VEL51od9BRaqXwdgaS7M7kY0tTVPwNTtF3MAYfxP6qMMa30l mGHlIA4uPd4aULDR8aDy0LZ8/kemKw3pI13Pcv5udq0uVNNzAmIFYApUN5u6bNthVlce5rq4u +2Ql5LV2TeV//tuw0WDRNQO3n5otOeLCe3EsmRVf8TznIqUuktGIP7IQoZTda0Ksi8mp3S3RO cfEEwxxjwquy3jBOreJP3K092mbzeJxlaVjzEhBIUz0bBESw01Ttw5cB5kefW+TH843QKVW8d WDAn/Imx34eL+8X8W0qbpzOuy4Kw0hcMjjEf2LuQ99OzbWF6Ak= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 10 Dec 2017 16:15:41 +0100 * Return directly after a call of the function "kcalloc" failed at the beginning. * Delete the jump label "err" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- drivers/tty/moxa.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c index a74caf05cf57..571c8456056c 100644 --- a/drivers/tty/moxa.c +++ b/drivers/tty/moxa.c @@ -835,10 +835,8 @@ static int moxa_init_board(struct moxa_board_conf *brd, struct device *dev) brd->ports = kcalloc(MAX_PORTS_PER_BOARD, sizeof(*brd->ports), GFP_KERNEL); - if (brd->ports == NULL) { - ret = -ENOMEM; - goto err; - } + if (!brd->ports) + return -ENOMEM; for (i = 0, p = brd->ports; i < MAX_PORTS_PER_BOARD; i++, p++) { tty_port_init(&p->port); @@ -892,7 +890,6 @@ static int moxa_init_board(struct moxa_board_conf *brd, struct device *dev) for (i = 0; i < MAX_PORTS_PER_BOARD; i++) tty_port_destroy(&brd->ports[i].port); kfree(brd->ports); -err: return ret; } -- 2.15.1