diff --git a/[refs] b/[refs] index a560f92699e9..fef84435497b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d675c989ed2d4ba23dff615330b04371aea83534 +refs/heads/master: 9b200b02a6c9cddca5132d64aa41156bbcddcbaa diff --git a/trunk/drivers/net/slip.c b/trunk/drivers/net/slip.c index 19112712daf0..c79e0ad4ba02 100644 --- a/trunk/drivers/net/slip.c +++ b/trunk/drivers/net/slip.c @@ -198,18 +198,12 @@ sl_alloc_bufs(struct slip *sl, int mtu) static void sl_free_bufs(struct slip *sl) { - void * tmp; - /* Free all SLIP frame buffers. */ - tmp = xchg(&sl->rbuff, NULL); - kfree(tmp); - tmp = xchg(&sl->xbuff, NULL); - kfree(tmp); + kfree(xchg(&sl->rbuff, NULL)); + kfree(xchg(&sl->xbuff, NULL)); #ifdef SL_INCLUDE_CSLIP - tmp = xchg(&sl->cbuff, NULL); - kfree(tmp); - if ((tmp = xchg(&sl->slcomp, NULL)) != NULL) - slhc_free(tmp); + kfree(xchg(&sl->cbuff, NULL)); + slhc_free(xchg(&sl->slcomp, NULL)); #endif }