diff --git a/[refs] b/[refs]
index 5081c0368cdc..48e1c84ded5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b150718ecb6468d2de1ff593c402ec257dd80c8c
+refs/heads/master: ba34efba7ab0eed43aca254738c0446af644fb15
diff --git a/trunk/drivers/staging/ozwpan/ozproto.c b/trunk/drivers/staging/ozwpan/ozproto.c
index cfb5160d1ebe..e00a53915daa 100644
--- a/trunk/drivers/staging/ozwpan/ozproto.c
+++ b/trunk/drivers/staging/ozwpan/ozproto.c
@@ -566,8 +566,7 @@ static void oz_protocol_timer(unsigned long arg)
 		}
 		spin_unlock_bh(&g_polling_lock);
 		oz_pd_put(pd);
-		if (t)
-			kfree(t);
+		kfree(t);
 		t = t2;
 	} while (t);
 	g_timer_state = OZ_TIMER_IDLE;