From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753149AbdLMNOb (ORCPT ); Wed, 13 Dec 2017 08:14:31 -0500 Received: from mout.web.de ([212.227.15.14]:50309 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752742AbdLMNO3 (ORCPT ); Wed, 13 Dec 2017 08:14:29 -0500 Subject: [PATCH 4/4] staging/wlan-ng/prism2fw: Use common error handling code in writeimage() From: SF Markus Elfring To: devel@driverdev.osuosl.org, Greg Kroah-Hartman , Maciek Borzecki , Simo Koskinen , Thibaut Sautereau Cc: LKML , kernel-janitors@vger.kernel.org References: <3599ae76-1aa8-4b6a-bf31-90e467759629@users.sourceforge.net> Message-ID: <73da6cfc-5534-556d-3d3c-542cc31e8eef@users.sourceforge.net> Date: Wed, 13 Dec 2017 14:14:26 +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: <3599ae76-1aa8-4b6a-bf31-90e467759629@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:KpbIy2xVgAhtt8+ZRPbmXdDYRbI1TjDh2eIKeHv6+lyOP34byEd DFeWt5O7CC9sYSUdr3a0PFfBV1veG5dnheSEIR4ZGyaZkajb4cOeKk0GPCiueeE+k0F2bQG g5Wof1iejsIP/D2SuzpbAzS9KdB+vSobFQAO8O+R+NlGTpr4VWti+Ow5nWP6eYLnp2Mnuxk eliucmhsIkGOpPk4YFdjQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:WLPSYkYcshM=:42pLkIWuG3L/W1Lr3vvsd8 uTZ8iOTTYufA6UPp/4wRm/BnZT0+EOovr7WFVxWHz9MGg97M6gGEJCaSuBwWwesWE2X/Z2SY2 lSPfVsIx7qELJGK1bEmoSuiVmYaux2O8sg7g8deCFXL7zUS5D3TqsWV67DjPUiftkenJyxu1S im4Ek2NofkIoDhCM1U8+TY1tQMTwEQNfdVMZSsLqUxLDC048QTJ+lwilecm0RJLRDu9H519A2 1IkcDxirUkyzSwy/6ZFWhsxEuO2XTGKwvtamFlIoQx/KHNmmzBGnLxralGt0R/cBbhTWL0FB+ uXb9igGxGDGSuWHoV+lKNovBE9rXYkYDEd7IIUPulERJJxVOHuyGPp8d3GjvjhgTj45SsdFfi JurYB2zNc/dyfCjrP4ae5lFZcNG8M9lhZn0rJdGIcOmWbHcM0E8FxHB1e97Ar+puHuJyKNE4m y6nY8UKTM+n8FaYTk3pXsw+LQSiEk6zhNl4ZNDavmsWGd4i5u9/rQmF7Qtwk4w0DSGriSUC9f V2NmluqSUAVR1OzgRYEprAaxMcmLzCvPdheumQqnDXr5MhOp3XVhbDELJpmCMiUTiCVJLoUpz qxetJRY4Sd0by5mawZEuatp0lHYiZwLRT1zOdYuqSPx4NQ8jrjBG7UZnnAbhKWJcX/zXUZBR2 A0AkFhdfqdDxprXawL6/IUzdRUXfyjXxt5O2qhgt8Irrp34g14swaeK9K4ySuwpo7CkUsoxqi ajorU4lq+9ALhQbGL5+zzkXmymtUBtL6lFS/937XKKJMud5YQ1NC1sQQO0RULQdBUxaWCwT/3 0g27y3qAQRcv14/4U0v4jXQ2IioW07/7zveGhfCbNyNpk99Pdw= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 13 Dec 2017 13:41:41 +0100 Replace two calls of the function "kfree" by a jump to the same statements at the end of this function so that the generated object code could become a bit smaller. Signed-off-by: Markus Elfring --- drivers/staging/wlan-ng/prism2fw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index e6f7ed17106a..42ad5ff7772e 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -1012,9 +1012,8 @@ static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk, rstmsg = kzalloc(sizeof(*rstmsg), GFP_KERNEL); rwrmsg = kzalloc(sizeof(*rwrmsg), GFP_KERNEL); if (!rstmsg || !rwrmsg) { - kfree(rstmsg); - kfree(rwrmsg); - return -ENOMEM; + result = -ENOMEM; + goto free_result; } /* Initialize the messages */ -- 2.15.1