From 2fd9c82db0f36211a9765692f7c183e134bd4696 Mon Sep 17 00:00:00 2001
From: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Date: Wed, 27 May 2009 01:04:40 -0700
Subject: [PATCH] --- yaml --- r: 150877 b: refs/heads/master c:
 59063afa0afabc68d2b6ca0d106da9165e1c7d39 h: refs/heads/master i:   150875:
 7ba3fb86ebd82731e69891c686cc427fb296b184 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/wimax/i2400m/tx.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 59642eea40c4..b22a80ccd38e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4bd07e3b13e3c848c7678c4fc870cca1d22ed4e
+refs/heads/master: 59063afa0afabc68d2b6ca0d106da9165e1c7d39
diff --git a/trunk/drivers/net/wimax/i2400m/tx.c b/trunk/drivers/net/wimax/i2400m/tx.c
index 4295dcf96ee2..fa16ccf8e26a 100644
--- a/trunk/drivers/net/wimax/i2400m/tx.c
+++ b/trunk/drivers/net/wimax/i2400m/tx.c
@@ -653,6 +653,8 @@ int i2400m_tx(struct i2400m *i2400m, const void *buf, size_t buf_len,
 		i2400m_tx_close(i2400m);
 		i2400m_tx_new(i2400m);
 	}
+	if (i2400m->tx_msg == NULL)
+		goto error_tx_new;
 	if (i2400m->tx_msg->size + padded_len > I2400M_TX_BUF_SIZE / 2) {
 		d_printf(2, dev, "TX: message too big, going new\n");
 		i2400m_tx_close(i2400m);