aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c527.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/3c527.c')
-rw-r--r--drivers/net/3c527.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index 6021e6dded8f..36c4191e7bca 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -443,7 +443,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
443 * Grab the IRQ 443 * Grab the IRQ
444 */ 444 */
445 445
446 err = request_irq(dev->irq, &mc32_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM, DRV_NAME, dev); 446 err = request_irq(dev->irq, mc32_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM, DRV_NAME, dev);
447 if (err) { 447 if (err) {
448 release_region(dev->base_addr, MC32_IO_EXTENT); 448 release_region(dev->base_addr, MC32_IO_EXTENT);
449 pr_err("%s: unable to get IRQ %d.\n", DRV_NAME, dev->irq); 449 pr_err("%s: unable to get IRQ %d.\n", DRV_NAME, dev->irq);
@@ -1168,8 +1168,8 @@ static void mc32_rx_ring(struct net_device *dev)
1168 1168
1169 /* Try to save time by avoiding a copy on big frames */ 1169 /* Try to save time by avoiding a copy on big frames */
1170 1170
1171 if ((length > RX_COPYBREAK) 1171 if ((length > RX_COPYBREAK) &&
1172 && ((newskb=dev_alloc_skb(1532)) != NULL)) 1172 ((newskb=dev_alloc_skb(1532)) != NULL))
1173 { 1173 {
1174 skb=lp->rx_ring[rx_ring_tail].skb; 1174 skb=lp->rx_ring[rx_ring_tail].skb;
1175 skb_put(skb, length); 1175 skb_put(skb, length);