From 5aaaa7ab5e467c822de626ecdcfcbcabd5c1beca Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Tue, 20 Nov 2012 17:10:08 +0530 Subject: [PATCH] --- yaml --- r: 338021 b: refs/heads/master c: b150718ecb6468d2de1ff593c402ec257dd80c8c h: refs/heads/master i: 338019: 459e8f5de81fee3e2caaba2cbb089b1f3a5491ba v: v3 --- [refs] | 2 +- trunk/drivers/staging/ozwpan/ozpd.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ec84c91342ba..5081c0368cdc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43f971ebca027fa62b306b8651de31a6bf41a2f7 +refs/heads/master: b150718ecb6468d2de1ff593c402ec257dd80c8c diff --git a/trunk/drivers/staging/ozwpan/ozpd.c b/trunk/drivers/staging/ozwpan/ozpd.c index 0b3648ce9687..118a4db74dec 100644 --- a/trunk/drivers/staging/ozwpan/ozpd.c +++ b/trunk/drivers/staging/ozwpan/ozpd.c @@ -402,8 +402,7 @@ static void oz_tx_frame_free(struct oz_pd *pd, struct oz_tx_frame *f) f = 0; } spin_unlock_bh(&pd->tx_frame_lock); - if (f) - kfree(f); + kfree(f); } /*------------------------------------------------------------------------------ * Context: softirq-serialized @@ -737,8 +736,7 @@ int oz_isoc_stream_create(struct oz_pd *pd, u8 ep_num) st = 0; } spin_unlock_bh(&pd->stream_lock); - if (st) - kfree(st); + kfree(st); return 0; } /*------------------------------------------------------------------------------