From bbb82575e0b70f9674dd2da5dec4e32f06f0b80e Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Fri, 5 Oct 2012 12:40:56 +0000 Subject: [PATCH] --- yaml --- r: 332911 b: refs/heads/master c: 0bd8ba18b9384e1c9104eee1d912fd5c8b4234c0 h: refs/heads/master i: 332909: 6dc256ef3f2b32cbb2557138d1d3002326c1b6fb 332907: 89ea56fa6344e20e720e9f65236be7e97d741052 332903: 3bfe6466cf62ea87321471d3791479448b76c9c3 332895: ac25d000ca7922bf5040ef3e30d27438e23b26a6 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/marvell/sky2.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7842bc7d1e3c..0a91496f8ff0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbcf61fb30279c99e51b9d20b231e8513c5e6b1d +refs/heads/master: 0bd8ba18b9384e1c9104eee1d912fd5c8b4234c0 diff --git a/trunk/drivers/net/ethernet/marvell/sky2.c b/trunk/drivers/net/ethernet/marvell/sky2.c index 2b0748dba8b8..78946feab4a2 100644 --- a/trunk/drivers/net/ethernet/marvell/sky2.c +++ b/trunk/drivers/net/ethernet/marvell/sky2.c @@ -4924,6 +4924,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev, if (~reg == 0) { dev_err(&pdev->dev, "PCI configuration read error\n"); + err = -EIO; goto err_out; } @@ -4993,8 +4994,10 @@ static int __devinit sky2_probe(struct pci_dev *pdev, hw->st_size = hw->ports * roundup_pow_of_two(3*RX_MAX_PENDING + TX_MAX_PENDING); hw->st_le = pci_alloc_consistent(pdev, hw->st_size * sizeof(struct sky2_status_le), &hw->st_dma); - if (!hw->st_le) + if (!hw->st_le) { + err = -ENOMEM; goto err_out_reset; + } dev_info(&pdev->dev, "Yukon-2 %s chip revision %d\n", sky2_name(hw->chip_id, buf1, sizeof(buf1)), hw->chip_rev);