From 3c8abd10fd55daa4986e2fa05088bf5200e76b6d Mon Sep 17 00:00:00 2001
From: Chuck Short <zulcss@gmail.com>
Date: Mon, 25 Sep 2006 22:31:03 -0700
Subject: [PATCH] --- yaml --- r: 36757 b: refs/heads/master c:
 83e331e2a492a134e491bcf50c984fd50c7fae03 h: refs/heads/master i:   36755:
 778157dbb44e2d02b763bffd0bddfdd45f29ed3f v: v3

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

diff --git a/[refs] b/[refs]
index ccb5d0cfca8f..127cd6f8848b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 293b9c42511d800b5f7bb2acba50f3e584b8c410
+refs/heads/master: 83e331e2a492a134e491bcf50c984fd50c7fae03
diff --git a/trunk/drivers/net/irda/via-ircc.c b/trunk/drivers/net/irda/via-ircc.c
index 79b85f327500..d916e1257c47 100644
--- a/trunk/drivers/net/irda/via-ircc.c
+++ b/trunk/drivers/net/irda/via-ircc.c
@@ -1223,8 +1223,13 @@ static int upload_rxdata(struct via_ircc_cb *self, int iobase)
 
 	IRDA_DEBUG(2, "%s(): len=%x\n", __FUNCTION__, len);
 
+	if ((len - 4) < 2) {
+		self->stats.rx_dropped++;
+		return FALSE;
+	}
+
 	skb = dev_alloc_skb(len + 1);
-	if ((skb == NULL) || ((len - 4) < 2)) {
+	if (skb == NULL) {
 		self->stats.rx_dropped++;
 		return FALSE;
 	}