diff options
author | Tiezhu Yang <kernelpatch@126.com> | 2016-06-25 00:35:22 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-07-15 15:44:45 -0400 |
commit | fcbefc3b2bfb4dd1a230b3082b68bc7cf7c081e7 (patch) | |
tree | 4ef708343915ce4d1d02ed1e448a8ee0da09c8b9 | |
parent | 3fb134cb4c170debf2b786d689fe263186feea4b (diff) |
scsi: ufs: remove unnecessary goto label
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 <kernelpatch@126.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r-- | drivers/scsi/ufs/ufshcd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 8e8989a1859b..f08d41a2d70b 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, | |||
2137 | buff_ascii = kmalloc(ascii_len, GFP_KERNEL); | 2137 | buff_ascii = kmalloc(ascii_len, GFP_KERNEL); |
2138 | if (!buff_ascii) { | 2138 | if (!buff_ascii) { |
2139 | err = -ENOMEM; | 2139 | err = -ENOMEM; |
2140 | goto out_free_buff; | 2140 | goto out; |
2141 | } | 2141 | } |
2142 | 2142 | ||
2143 | /* | 2143 | /* |
@@ -2156,7 +2156,6 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, int desc_index, u8 *buf, | |||
2156 | size - QUERY_DESC_HDR_SIZE); | 2156 | size - QUERY_DESC_HDR_SIZE); |
2157 | memcpy(buf + QUERY_DESC_HDR_SIZE, buff_ascii, ascii_len); | 2157 | memcpy(buf + QUERY_DESC_HDR_SIZE, buff_ascii, ascii_len); |
2158 | buf[QUERY_DESC_LENGTH_OFFSET] = ascii_len + QUERY_DESC_HDR_SIZE; | 2158 | buf[QUERY_DESC_LENGTH_OFFSET] = ascii_len + QUERY_DESC_HDR_SIZE; |
2159 | out_free_buff: | ||
2160 | kfree(buff_ascii); | 2159 | kfree(buff_ascii); |
2161 | } | 2160 | } |
2162 | out: | 2161 | out: |