From 33e819c23a640609ed5e30556ac2a5864d3c439c Mon Sep 17 00:00:00 2001
From: Rupesh Gujare <rgujare@ozmodevices.com>
Date: Wed, 25 Apr 2012 23:54:58 +0100
Subject: [PATCH] --- yaml --- r: 299839 b: refs/heads/master c:
 89f21cc050d5eed8eeffee5b46297fb7a74ef9dd h: refs/heads/master i:   299837:
 45ac01d47260a642066e0ab7ae38bc24b7bcb87c   299835:
 d67b43209fbe69ca1d7d90f4b4086f1d0cb158f3   299831:
 fcb29555bb24d95bf645f9a86a96d24afbb014e7   299823:
 01ea9639032197a4af8a8e3622878974a37626b4   299807:
 6a648ce7fd15c15231f54b0324a62503714cb694   299775:
 02d47f1cdbbb6fca1f893d53ed05111dab728095 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/staging/ozwpan/ozpd.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d4d8cea9c8a6..c392bee4aa7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc890df0a77cafe5f4a3d81c0dade637c27f1934
+refs/heads/master: 89f21cc050d5eed8eeffee5b46297fb7a74ef9dd
diff --git a/trunk/drivers/staging/ozwpan/ozpd.c b/trunk/drivers/staging/ozwpan/ozpd.c
index 2b45d3d1800c..04cd57f2a6da 100644
--- a/trunk/drivers/staging/ozwpan/ozpd.c
+++ b/trunk/drivers/staging/ozwpan/ozpd.c
@@ -383,8 +383,6 @@ static void oz_tx_frame_free(struct oz_pd *pd, struct oz_tx_frame *f)
 		pd->tx_pool = &f->link;
 		pd->tx_pool_count++;
 		f = 0;
-	} else {
-		kfree(f);
 	}
 	spin_unlock_bh(&pd->tx_frame_lock);
 	if (f)