aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJirka Pirko <jirka@pirko.cz>2008-11-24 17:47:53 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-24 17:47:53 -0500
commitd0cc10ab0e3740b629d88386c907342f77cbdb30 (patch)
tree094757b72e6cffda659fc8d18b72755a5deccf21
parent85920d43bd5ae8a96f434704438b57c0b8c31198 (diff)
tokenring/3c359.c: fix allocation null check
Fixed typo when allocating rx_ring, tx_ring was checked for null instead. Signed-off-by: Jirka Pirko <jirka@pirko.cz> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/tokenring/3c359.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 87509a65b3bf..7b45a293f5ec 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)
644 return -ENOMEM; 644 return -ENOMEM;
645 } 645 }
646 xl_priv->xl_rx_ring = kzalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL); 646 xl_priv->xl_rx_ring = kzalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL);
647 if (xl_priv->xl_tx_ring == NULL) { 647 if (xl_priv->xl_rx_ring == NULL) {
648 printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n", 648 printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
649 dev->name); 649 dev->name);
650 free_irq(dev->irq,dev); 650 free_irq(dev->irq,dev);