From a92e83f3830c22c83d950266339c686d4dde1aa4 Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Fri, 5 Oct 2012 12:40:55 +0000 Subject: [PATCH] --- yaml --- r: 332910 b: refs/heads/master c: bbcf61fb30279c99e51b9d20b231e8513c5e6b1d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/marvell/skge.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3948c4359f6e..7842bc7d1e3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4df128341ed5728bc8d8f75709258967f8cc2f5f +refs/heads/master: bbcf61fb30279c99e51b9d20b231e8513c5e6b1d diff --git a/trunk/drivers/net/ethernet/marvell/skge.c b/trunk/drivers/net/ethernet/marvell/skge.c index 5a30bf823099..91836b54da35 100644 --- a/trunk/drivers/net/ethernet/marvell/skge.c +++ b/trunk/drivers/net/ethernet/marvell/skge.c @@ -3945,8 +3945,10 @@ static int __devinit skge_probe(struct pci_dev *pdev, skge_board_name(hw), hw->chip_rev); dev = skge_devinit(hw, 0, using_dac); - if (!dev) + if (!dev) { + err = -ENOMEM; goto err_out_led_off; + } /* Some motherboards are broken and has zero in ROM. */ if (!is_valid_ether_addr(dev->dev_addr))