From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751885AbcFYFHV (ORCPT ); Sat, 25 Jun 2016 01:07:21 -0400 Received: from m15-36.126.com ([220.181.15.36]:53880 "EHLO m15-36.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750961AbcFYFHU (ORCPT ); Sat, 25 Jun 2016 01:07:20 -0400 X-Greylist: delayed 1857 seconds by postgrey-1.27 at vger.kernel.org; Sat, 25 Jun 2016 01:07:19 EDT X-Originating-IP: [113.200.155.189] Date: Sat, 25 Jun 2016 12:35:22 +0800 (CST) From: "Tiezhu Yang" To: martin.petersen@oracle.com, jejb@linux.vnet.ibm.com, vinholikatti@gmail.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: ufs: remove unnecessary goto label X-Priority: 3 X-Mailer: Coremail Webmail Server Version SP_ntes V3.5 build 20160420(83524.8626) Copyright (c) 2002-2016 www.mailtech.cn 126com Content-Type: text/plain; charset=GBK MIME-Version: 1.0 Message-ID: <73f0ab56.2322.15585d73a9e.Coremail.kernelpatch@126.com> X-Coremail-Locale: zh_CN X-CM-TRANSID: JMqowEDp50ELCm5XVoMiAA--.56764W X-CM-SenderInfo: xnhu0vxosd3ubk6rjloofrz/1tbimR+R9VYFLxwgZgACsG X-Coremail-Antispam: 1U5529EdanIXcx71UUUUU7vcSsGvfC2KfnxnUU== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id u5P57c2Q028795 When buff_ascii kmalloc failed, there is no need to call kfree, it should return -ENOMEM directly, this patch fixes it. Signed-off-by: Tiezhu Yang --- drivers/scsi/ufs/ufshcd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 8e8989a..f08d41a 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -2137,7 +2137,7 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, int desc_index, u8 *buf, buff_ascii = kmalloc(ascii_len, GFP_KERNEL); if (!buff_ascii) { err = -ENOMEM; - goto out_free_buff; + goto out; } /* @@ -2156,7 +2156,6 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, int desc_index, u8 *buf, size - QUERY_DESC_HDR_SIZE); memcpy(buf + QUERY_DESC_HDR_SIZE, buff_ascii, ascii_len); buf[QUERY_DESC_LENGTH_OFFSET] = ascii_len + QUERY_DESC_HDR_SIZE; -out_free_buff: kfree(buff_ascii); } out: -- 1.8.3.1