From 289e7a661a39fcf96e1e390944db873957aa8024 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 6 Jan 2006 16:57:44 -0800 Subject: [PATCH] --- yaml --- r: 17095 b: refs/heads/master c: df22b8aaba3f41cc61f57f5ead78be45edcb7db5 h: refs/heads/master i: 17093: ec6ed85109afe1e9a0c29d878849edbfd7843034 17091: ba11900fe28d88ab3a28b5aec5ab78b7ae6638d9 17087: 5a1a2aedc647269f63e742eb10b87c07ab97af29 v: v3 --- [refs] | 2 +- trunk/drivers/net/sk98lin/skge.c | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 02121ec9f0d0..21decba82788 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 162875570e65b56a7f4d804fc32aebf7a434cf89 +refs/heads/master: df22b8aaba3f41cc61f57f5ead78be45edcb7db5 diff --git a/trunk/drivers/net/sk98lin/skge.c b/trunk/drivers/net/sk98lin/skge.c index 455417d5fcfb..197edd74fbb5 100644 --- a/trunk/drivers/net/sk98lin/skge.c +++ b/trunk/drivers/net/sk98lin/skge.c @@ -292,17 +292,12 @@ static __devinit int SkGeInitPCI(SK_AC *pAC) struct pci_dev *pdev = pAC->PciDev; int retval; - if (pci_enable_device(pdev) != 0) { - return 1; - } - dev->mem_start = pci_resource_start (pdev, 0); pci_set_master(pdev); - if (pci_request_regions(pdev, "sk98lin") != 0) { - retval = 2; - goto out_disable; - } + retval = pci_request_regions(pdev, "sk98lin"); + if (retval) + goto out; #ifdef SK_BIG_ENDIAN /* @@ -321,9 +316,8 @@ static __devinit int SkGeInitPCI(SK_AC *pAC) * Remap the regs into kernel space. */ pAC->IoBase = ioremap_nocache(dev->mem_start, 0x4000); - - if (!pAC->IoBase){ - retval = 3; + if (!pAC->IoBase) { + retval = -EIO; goto out_release; } @@ -331,8 +325,7 @@ static __devinit int SkGeInitPCI(SK_AC *pAC) out_release: pci_release_regions(pdev); - out_disable: - pci_disable_device(pdev); + out: return retval; }