Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122115
b: refs/heads/master
c: d0cc10a
h: refs/heads/master
i:
  122113: fac3b2f
  122111: 5ca8caf
v: v3
  • Loading branch information
Jirka Pirko authored and David S. Miller committed Nov 24, 2008
1 parent 99ff331 commit 27fc528
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 85920d43bd5ae8a96f434704438b57c0b8c31198
refs/heads/master: d0cc10ab0e3740b629d88386c907342f77cbdb30
2 changes: 1 addition & 1 deletion trunk/drivers/net/tokenring/3c359.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 27fc528

Please sign in to comment.