From andre@bitwigglers.org Mon Jan 26 09:43:15 2009 From: Andre Haupt Date: Mon, 26 Jan 2009 16:12:21 +0100 Subject: Staging: me4000: kfree(NULL) is safe, so no extra checks needed. To: greg@kroah.com Cc: Andre Haupt , g.gebhardt@meilhaus.de, w.beiter@aon.at Message-ID: <1232982745-16220-6-git-send-email-andre@bitwigglers.org> Signed-off-by: Andre Haupt Signed-off-by: Greg Kroah-Hartman --- drivers/staging/me4000/me4000.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --- a/drivers/staging/me4000/me4000.c +++ b/drivers/staging/me4000/me4000.c @@ -546,15 +546,13 @@ static void clear_board_info_list(void) &board_info->ao_context_list, list) { me4000_ao_reset(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); kfree(ao_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); /* Clear digital I/O context */ @@ -3668,8 +3666,7 @@ AI_CONFIG_ERR: tmp &= ~(ME4000_AI_CTRL_BIT_CHANNEL_FIFO | ME4000_AI_CTRL_BIT_SAMPLE_HOLD); - if (list) - kfree(list); + kfree(list); return err;