[SLIP]: Remove redundant NULL pointer checks prior to kfree
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
18900829f3
commit
158a0e45b6
1 changed files with 12 additions and 18 deletions
|
@ -185,14 +185,11 @@ sl_alloc_bufs(struct slip *sl, int mtu)
|
|||
/* Cleanup */
|
||||
err_exit:
|
||||
#ifdef SL_INCLUDE_CSLIP
|
||||
if (cbuff)
|
||||
kfree(cbuff);
|
||||
if (slcomp)
|
||||
slhc_free(slcomp);
|
||||
#endif
|
||||
if (xbuff)
|
||||
kfree(xbuff);
|
||||
if (rbuff)
|
||||
kfree(rbuff);
|
||||
return err;
|
||||
}
|
||||
|
@ -204,12 +201,12 @@ sl_free_bufs(struct slip *sl)
|
|||
void * tmp;
|
||||
|
||||
/* Free all SLIP frame buffers. */
|
||||
if ((tmp = xchg(&sl->rbuff, NULL)) != NULL)
|
||||
tmp = xchg(&sl->rbuff, NULL);
|
||||
kfree(tmp);
|
||||
if ((tmp = xchg(&sl->xbuff, NULL)) != NULL)
|
||||
tmp = xchg(&sl->xbuff, NULL);
|
||||
kfree(tmp);
|
||||
#ifdef SL_INCLUDE_CSLIP
|
||||
if ((tmp = xchg(&sl->cbuff, NULL)) != NULL)
|
||||
tmp = xchg(&sl->cbuff, NULL);
|
||||
kfree(tmp);
|
||||
if ((tmp = xchg(&sl->slcomp, NULL)) != NULL)
|
||||
slhc_free(tmp);
|
||||
|
@ -297,12 +294,9 @@ static int sl_realloc_bufs(struct slip *sl, int mtu)
|
|||
spin_unlock_bh(&sl->lock);
|
||||
|
||||
done:
|
||||
if (xbuff)
|
||||
kfree(xbuff);
|
||||
if (rbuff)
|
||||
kfree(rbuff);
|
||||
#ifdef SL_INCLUDE_CSLIP
|
||||
if (cbuff)
|
||||
kfree(cbuff);
|
||||
#endif
|
||||
return err;
|
||||
|
|
Loading…
Reference in a new issue