Patchwork tokenring/3c359.c: fix allocation null check

login
register
mail settings
Submitter Jirka Pirko
Date Nov. 23, 2008, 7:28 p.m.
Message ID <20081123202850.372eb7cb@jirka.pirko.cz>
Download mbox | patch
Permalink /patch/10331/
State Accepted
Delegated to: David Miller
Headers show

Comments

Jirka Pirko - Nov. 23, 2008, 7:28 p.m.
Fixed type when allocating rx_ring, tx_ring was checked for null instead.

Signed-off-by: Jirka Pirko <jirka@pirko.cz>
---
 drivers/net/tokenring/3c359.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
David Miller - Nov. 24, 2008, 10:48 p.m.
From: Jirka Pirko <jirka@pirko.cz>
Date: Sun, 23 Nov 2008 20:28:50 +0100

> Fixed type when allocating rx_ring, tx_ring was checked for null instead.
> 
> Signed-off-by: Jirka Pirko <jirka@pirko.cz>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index bf62132..f832f9b 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/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);