From 56d0840ad330edd5a71360d037f28b0ee9b960e2 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Fri, 10 Dec 2010 14:02:58 +0000 Subject: [PATCH] --- yaml --- r: 224984 b: refs/heads/master c: dc66daa9be40369ead5a4ee33c6bcfb44cb3c8ee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/vxge/vxge-main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b4337cb13340..d8e7a916c92c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c92bf70dcb9d08f821e4c9f09f8fc328495ba998 +refs/heads/master: dc66daa9be40369ead5a4ee33c6bcfb44cb3c8ee diff --git a/trunk/drivers/net/vxge/vxge-main.c b/trunk/drivers/net/vxge/vxge-main.c index 9c68c60f27d8..faebffb02d12 100644 --- a/trunk/drivers/net/vxge/vxge-main.c +++ b/trunk/drivers/net/vxge/vxge-main.c @@ -4325,7 +4325,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre) goto _exit1; } - if (pci_request_regions(pdev, VXGE_DRIVER_NAME)) { + if (pci_request_region(pdev, 0, VXGE_DRIVER_NAME)) { vxge_debug_init(VXGE_ERR, "%s : request regions failed", __func__); ret = -ENODEV; @@ -4638,7 +4638,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre) _exit3: iounmap(attr.bar0); _exit2: - pci_release_regions(pdev); + pci_release_region(pdev, 0); _exit1: pci_disable_device(pdev); _exit0: @@ -4695,7 +4695,7 @@ static void __devexit vxge_remove(struct pci_dev *pdev) vxge_hw_device_terminate(hldev); pci_disable_device(pdev); - pci_release_regions(pdev); + pci_release_region(pdev, 0); pci_set_drvdata(pdev, NULL); vxge_debug_entryexit(vdev->level_trace, "%s:%d Exiting...", __func__, __LINE__);