lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: me4000: kfree(NULL) is safe, so no extra checks needed.

Browse Source 
Signed-off-by: Andre Haupt <andre@bitwigglers.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Andre Haupt
2009-01-26 16:12:21 +01:00
committed by Greg Kroah-Hartman
parent 705d300e1b
commit e8aa1bd098
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/me4000/me4000.c
View File

@@ -546,15 +546,13 @@ static void clear_board_info_list(void)
&board_info->ao_context_list, list) { &board_info->ao_context_list, list) {
me4000_ao_reset(ao_context); me4000_ao_reset(ao_context);
free_irq(ao_context->irq, ao_context); free_irq(ao_context->irq, ao_context);
if (ao_context->circ_buf.buf) kfree(ao_context->circ_buf.buf);
kfree(ao_context->circ_buf.buf);
list_del(&ao_context->list); list_del(&ao_context->list);
kfree(ao_context); kfree(ao_context);
} }
/* Clear analog input context */ /* Clear analog input context */
if (board_info->ai_context->circ_buf.buf) kfree(board_info->ai_context->circ_buf.buf);
kfree(board_info->ai_context->circ_buf.buf);
kfree(board_info->ai_context); kfree(board_info->ai_context);
/* Clear digital I/O context */ /* Clear digital I/O context */
@@ -3668,8 +3666,7 @@ AI_CONFIG_ERR:
tmp &= tmp &=
~(ME4000_AI_CTRL_BIT_CHANNEL_FIFO | ME4000_AI_CTRL_BIT_SAMPLE_HOLD); ~(ME4000_AI_CTRL_BIT_CHANNEL_FIFO | ME4000_AI_CTRL_BIT_SAMPLE_HOLD);
if (list) kfree(list);
kfree(list);
return err; return err;