Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/net/slip.c

+12 −18
Original line number Diff line number Diff line
@@ -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;