leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: wilc1000: linux_wlan_spi.c: fix kzalloc error check

Browse Source 
This patch fixes error check of kzalloc.
If kzalloc is failed, return type is used as -ENOMEM.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chaehyun Lim 2015-09-17 16:48:45 +09:00 committed by Greg Kroah-Hartman
parent fed16f2c91
commit a0e5facedb
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/wilc1000/linux_wlan_spi.c
View File

@ -125,10 +125,8 @@ int linux_spi_write(u8 *b, u32 len)
int remainder = len % TXRX_PHASE_SIZE; int remainder = len % TXRX_PHASE_SIZE;
char *r_buffer = kzalloc(TXRX_PHASE_SIZE, GFP_KERNEL); char *r_buffer = kzalloc(TXRX_PHASE_SIZE, GFP_KERNEL);
if (!r_buffer)
if (!r_buffer) { return -ENOMEM;
PRINT_ER("Failed to allocate memory for r_buffer\n");
}
if (blk) { if (blk) {
while (i < blk) { while (i < blk) {
@ -208,10 +206,9 @@ int linux_spi_write(u8 *b, u32 len)
.delay_usecs = 0, .delay_usecs = 0,
}; };
char *r_buffer = kzalloc(len, GFP_KERNEL); char *r_buffer = kzalloc(len, GFP_KERNEL);
if (!r_buffer)
return -ENOMEM;
if (!r_buffer) {
PRINT_ER("Failed to allocate memory for r_buffer\n");
}
tr.rx_buf = r_buffer; tr.rx_buf = r_buffer;
PRINT_D(BUS_DBG, "Request writing %d bytes\n", len); PRINT_D(BUS_DBG, "Request writing %d bytes\n", len);
@ -257,10 +254,8 @@ int linux_spi_read(unsigned char *rb, unsigned long rlen)
int remainder = rlen % TXRX_PHASE_SIZE; int remainder = rlen % TXRX_PHASE_SIZE;
char *t_buffer = kzalloc(TXRX_PHASE_SIZE, GFP_KERNEL); char *t_buffer = kzalloc(TXRX_PHASE_SIZE, GFP_KERNEL);
if (!t_buffer)
if (!t_buffer) { return -ENOMEM;
PRINT_ER("Failed to allocate memory for t_buffer\n");
}
if (blk) { if (blk) {
while (i < blk) { while (i < blk) {
@ -337,10 +332,9 @@ int linux_spi_read(unsigned char *rb, unsigned long rlen)
}; };
char *t_buffer = kzalloc(rlen, GFP_KERNEL); char *t_buffer = kzalloc(rlen, GFP_KERNEL);
if (!t_buffer)
return -ENOMEM;
if (!t_buffer) {
PRINT_ER("Failed to allocate memory for t_buffer\n");
}
tr.tx_buf = t_buffer; tr.tx_buf = t_buffer;
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));