From mboxrd@z Thu Jan 1 00:00:00 1970 From: frank.blaschka@de.ibm.com Subject: [patch 5/5] [PATCH] ctcm: fix error return code Date: Mon, 24 Sep 2012 16:24:27 +0200 Message-ID: <20120924142501.449097699@de.ibm.com> References: <20120924142422.001953152@de.ibm.com> Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org, Peter Senna Tschudin , Ursula Braun To: davem@davemloft.net Return-path: Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:50433 "EHLO e06smtp16.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755699Ab2IXOZJ (ORCPT ); Mon, 24 Sep 2012 10:25:09 -0400 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 24 Sep 2012 15:25:08 +0100 Content-Disposition: inline; filename=604-ctcm-return-code.diff Sender: netdev-owner@vger.kernel.org List-ID: From: Peter Senna Tschudin Convert a nonnegative error return code to a negative one, as returned elsewhere in the function. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // Signed-off-by: Peter Senna Tschudin Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka --- drivers/s390/net/ctcm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c index 5227e57..98ea9cc 100644 --- a/drivers/s390/net/ctcm_main.c +++ b/drivers/s390/net/ctcm_main.c @@ -1454,7 +1454,7 @@ static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type, ch_fsm_len, GFP_KERNEL); } if (ch->fsm == NULL) - goto free_return; + goto nomem_return; fsm_newstate(ch->fsm, CTC_STATE_IDLE); -- 1.7.11.7