evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: ft1000: Use specific return error codes.

Browse source 
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Marek Belisko 2010-10-15 08:57:25 +02:00 • committed by Greg Kroah-Hartman
parent dd9b6aa4fd
commit 78890fdb24
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
View file

@ -952,7 +952,7 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
if (!netdev ) if (!netdev )
{ {
DEBUG("init_ft1000_netdev: can not allocate network device\n"); DEBUG("init_ft1000_netdev: can not allocate network device\n");
return STATUS_FAILURE; return -ENOMEM;
} }
//pInfo = (PFT1000_INFO)netdev->priv; //pInfo = (PFT1000_INFO)netdev->priv;
@ -975,8 +975,7 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
ret_val = strict_strtoul(card_nr, 10, &gCardIndex); ret_val = strict_strtoul(card_nr, 10, &gCardIndex);
if (ret_val) { if (ret_val) {
printk(KERN_ERR "Can't parse netdev\n"); printk(KERN_ERR "Can't parse netdev\n");
free_netdev(netdev); goto err_net;
return STATUS_FAILURE;
} }
pInfo->CardNumber = gCardIndex; pInfo->CardNumber = gCardIndex;
@ -984,8 +983,8 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
} }
else { else {
printk(KERN_ERR "ft1000: Invalid device name\n"); printk(KERN_ERR "ft1000: Invalid device name\n");
free_netdev(netdev); ret_val = -ENXIO;
return STATUS_FAILURE; goto err_net;
} }
} }
else else
@ -1056,21 +1055,24 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
for (i=0; i<NUM_OF_FREE_BUFFERS; i++) { for (i=0; i<NUM_OF_FREE_BUFFERS; i++) {
// Get memory for DPRAM_DATA link list // Get memory for DPRAM_DATA link list
pdpram_blk = kmalloc ( sizeof(DPRAM_BLK), GFP_KERNEL ); pdpram_blk = kmalloc ( sizeof(DPRAM_BLK), GFP_KERNEL );
if (pdpram_blk == NULL) if (pdpram_blk == NULL) {
goto err_free; ret_val = -ENOMEM;
goto err_free;
}
// Get a block of memory to store command data // Get a block of memory to store command data
pdpram_blk->pbuffer = kmalloc ( MAX_CMD_SQSIZE, GFP_KERNEL ); pdpram_blk->pbuffer = kmalloc ( MAX_CMD_SQSIZE, GFP_KERNEL );
if (pdpram_blk->pbuffer == NULL) { if (pdpram_blk->pbuffer == NULL) {
kfree(pdpram_blk); ret_val = -ENOMEM;
goto err_free; kfree(pdpram_blk);
} goto err_free;
}
// link provisioning data // link provisioning data
list_add_tail (&pdpram_blk->list, &freercvpool); list_add_tail (&pdpram_blk->list, &freercvpool);
} }
numofmsgbuf = NUM_OF_FREE_BUFFERS; numofmsgbuf = NUM_OF_FREE_BUFFERS;
return STATUS_SUCCESS; return 0;
err_free: err_free:
@ -1080,7 +1082,9 @@ err_free:
kfree(pdpram_blk->pbuffer); kfree(pdpram_blk->pbuffer);
kfree(pdpram_blk); kfree(pdpram_blk);
} }
return STATUS_FAILURE; err_net:
free_netdev(netdev);
return ret_val;
} }