Commit 158a0e45 authored by Jesper Juhl's avatar Jesper Juhl Committed by David S. Miller

[SLIP]: Remove redundant NULL pointer checks prior to kfree

Signed-off-by: default avatarJesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18900829
...@@ -185,15 +185,12 @@ sl_alloc_bufs(struct slip *sl, int mtu) ...@@ -185,15 +185,12 @@ sl_alloc_bufs(struct slip *sl, int mtu)
/* Cleanup */ /* Cleanup */
err_exit: err_exit:
#ifdef SL_INCLUDE_CSLIP #ifdef SL_INCLUDE_CSLIP
if (cbuff) kfree(cbuff);
kfree(cbuff);
if (slcomp) if (slcomp)
slhc_free(slcomp); slhc_free(slcomp);
#endif #endif
if (xbuff) kfree(xbuff);
kfree(xbuff); kfree(rbuff);
if (rbuff)
kfree(rbuff);
return err; return err;
} }
...@@ -204,13 +201,13 @@ sl_free_bufs(struct slip *sl) ...@@ -204,13 +201,13 @@ sl_free_bufs(struct slip *sl)
void * tmp; void * tmp;
/* Free all SLIP frame buffers. */ /* Free all SLIP frame buffers. */
if ((tmp = xchg(&sl->rbuff, NULL)) != NULL) tmp = xchg(&sl->rbuff, NULL);
kfree(tmp); kfree(tmp);
if ((tmp = xchg(&sl->xbuff, NULL)) != NULL) tmp = xchg(&sl->xbuff, NULL);
kfree(tmp); kfree(tmp);
#ifdef SL_INCLUDE_CSLIP #ifdef SL_INCLUDE_CSLIP
if ((tmp = xchg(&sl->cbuff, NULL)) != NULL) tmp = xchg(&sl->cbuff, NULL);
kfree(tmp); kfree(tmp);
if ((tmp = xchg(&sl->slcomp, NULL)) != NULL) if ((tmp = xchg(&sl->slcomp, NULL)) != NULL)
slhc_free(tmp); slhc_free(tmp);
#endif #endif
...@@ -297,13 +294,10 @@ done_on_bh: ...@@ -297,13 +294,10 @@ done_on_bh:
spin_unlock_bh(&sl->lock); spin_unlock_bh(&sl->lock);
done: done:
if (xbuff) kfree(xbuff);
kfree(xbuff); kfree(rbuff);
if (rbuff)
kfree(rbuff);
#ifdef SL_INCLUDE_CSLIP #ifdef SL_INCLUDE_CSLIP
if (cbuff) kfree(cbuff);
kfree(cbuff);
#endif #endif
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment