From 27fc528fad2b69c32b73b66422af66a7672f9888 Mon Sep 17 00:00:00 2001
From: Jirka Pirko <jirka@pirko.cz>
Date: Mon, 24 Nov 2008 14:47:53 -0800
Subject: [PATCH] --- yaml --- r: 122115 b: refs/heads/master c:
 d0cc10ab0e3740b629d88386c907342f77cbdb30 h: refs/heads/master i:   122113:
 fac3b2ff907bbef7afcaef6a2c8b807113b8325f   122111:
 5ca8caff03b2d6940d572238608bd91128b6a39a v: v3

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

diff --git a/[refs] b/[refs]
index ea7ef225b9e4..9a3c8fab4ca1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85920d43bd5ae8a96f434704438b57c0b8c31198
+refs/heads/master: d0cc10ab0e3740b629d88386c907342f77cbdb30
diff --git a/trunk/drivers/net/tokenring/3c359.c b/trunk/drivers/net/tokenring/3c359.c
index 87509a65b3bf..7b45a293f5ec 100644
--- a/trunk/drivers/net/tokenring/3c359.c
+++ b/trunk/drivers/net/tokenring/3c359.c
@@ -644,7 +644,7 @@ static int xl_open(struct net_device *dev)
 		return -ENOMEM;
 	}
 	xl_priv->xl_rx_ring = kzalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL);
-	if (xl_priv->xl_tx_ring == NULL) {
+	if (xl_priv->xl_rx_ring == NULL) {
 		printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
 				     dev->name);
 		free_irq(dev->irq,dev);