iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: rewrite isd200_init_info for readability

Browse Source 
Previously, Coccinelle would issue the following false positive:

isd200.c:1478:14-18: ERROR: reference preceded by free on line 1472

This change rewrites the isd200_init_info function to have more explicit
execution pathways to make it easier for scripts and humans to parse.

Signed-off-by: Kris Borer <kborer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kris Borer 2015-08-28 09:31:43 -04:00 committed by Greg Kroah-Hartman
parent d0452fe09a
commit 8091e0cafb
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/usb/storage/isd200.c
View File

@ -1456,30 +1456,26 @@ static void isd200_free_info_ptrs(void *info_)
*/ */
static int isd200_init_info(struct us_data *us) static int isd200_init_info(struct us_data *us)
{ {
int retStatus = ISD200_GOOD;
struct isd200_info *info; struct isd200_info *info;
info = kzalloc(sizeof(struct isd200_info), GFP_KERNEL); info = kzalloc(sizeof(struct isd200_info), GFP_KERNEL);
if (!info) if (!info)
retStatus = ISD200_ERROR; return ISD200_ERROR;
else {
info->id = kzalloc(ATA_ID_WORDS * 2, GFP_KERNEL); info->id = kzalloc(ATA_ID_WORDS * 2, GFP_KERNEL);
info->RegsBuf = kmalloc(sizeof(info->ATARegs), GFP_KERNEL); info->RegsBuf = kmalloc(sizeof(info->ATARegs), GFP_KERNEL);
info->srb.sense_buffer = info->srb.sense_buffer = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
if (!info->id || !info->RegsBuf || !info->srb.sense_buffer) { if (!info->id || !info->RegsBuf || !info->srb.sense_buffer) {
isd200_free_info_ptrs(info); isd200_free_info_ptrs(info);
kfree(info); kfree(info);
retStatus = ISD200_ERROR; return ISD200_ERROR;
}
} }
if (retStatus == ISD200_GOOD) { us->extra = info;
us->extra = info; us->extra_destructor = isd200_free_info_ptrs;
us->extra_destructor = isd200_free_info_ptrs;
}
return retStatus; return ISD200_GOOD;
} }
/************************************************************************** /**************************************************************************