* [PATCH] tokenring/3c359.c: fix allocation null check
@ 2008-11-23 19:28 Jirka Pirko
2008-11-24 22:48 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jirka Pirko @ 2008-11-23 19:28 UTC (permalink / raw)
To: linux-kernel; +Cc: jgarzik, netdev, davem
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(-)
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);
--
1.5.4.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] tokenring/3c359.c: fix allocation null check
2008-11-23 19:28 [PATCH] tokenring/3c359.c: fix allocation null check Jirka Pirko
@ 2008-11-24 22:48 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2008-11-24 22:48 UTC (permalink / raw)
To: jirka; +Cc: linux-kernel, jgarzik, netdev
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-11-24 22:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-23 19:28 [PATCH] tokenring/3c359.c: fix allocation null check Jirka Pirko
2008-11-24 22:48 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®