From 4d84de1078ab9cea9487eac8b9179f4e4bb6ad8c Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Wed, 25 Feb 2009 00:14:27 +0000
Subject: [PATCH] --- yaml --- r: 134753 b: refs/heads/master c:
 875b48297b8ab2f402680821da47d23bd6bddc55 h: refs/heads/master i:   134751:
 d2729a2a342ddafc18439c4e4e76d4d9c8f985e5 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/irda/sir_dev.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 29962cbafed1..80a28e5acdf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d46604e178f01305e63564864517926bb752d4a3
+refs/heads/master: 875b48297b8ab2f402680821da47d23bd6bddc55
diff --git a/trunk/drivers/net/irda/sir_dev.c b/trunk/drivers/net/irda/sir_dev.c
index c23d211758ae..803c0be3fc7e 100644
--- a/trunk/drivers/net/irda/sir_dev.c
+++ b/trunk/drivers/net/irda/sir_dev.c
@@ -780,8 +780,7 @@ static int sirdev_alloc_buffers(struct sir_dev *dev)
 
 static void sirdev_free_buffers(struct sir_dev *dev)
 {
-	if (dev->rx_buff.skb)
-		kfree_skb(dev->rx_buff.skb);
+	kfree_skb(dev->rx_buff.skb);
 	kfree(dev->tx_buff.head);
 	dev->rx_buff.head = dev->tx_buff.head = NULL;
 	dev->rx_buff.skb = NULL;