aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ibm/emac
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/ibm/emac')
-rw-r--r--drivers/net/ethernet/ibm/emac/mal.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
index 50ea12bfb579..1f7ecf57181e 100644
--- a/drivers/net/ethernet/ibm/emac/mal.c
+++ b/drivers/net/ethernet/ibm/emac/mal.c
@@ -528,12 +528,9 @@ static int mal_probe(struct platform_device *ofdev)
528 irq_handler_t hdlr_serr, hdlr_txde, hdlr_rxde; 528 irq_handler_t hdlr_serr, hdlr_txde, hdlr_rxde;
529 529
530 mal = kzalloc(sizeof(struct mal_instance), GFP_KERNEL); 530 mal = kzalloc(sizeof(struct mal_instance), GFP_KERNEL);
531 if (!mal) { 531 if (!mal)
532 printk(KERN_ERR
533 "mal%d: out of memory allocating MAL structure!\n",
534 index);
535 return -ENOMEM; 532 return -ENOMEM;
536 } 533
537 mal->index = index; 534 mal->index = index;
538 mal->ofdev = ofdev; 535 mal->ofdev = ofdev;
539 mal->version = of_device_is_compatible(ofdev->dev.of_node, "ibm,mcmal2") ? 2 : 1; 536 mal->version = of_device_is_compatible(ofdev->dev.of_node, "ibm,mcmal2") ? 2 : 1;