From mboxrd@z Thu Jan 1 00:00:00 1970 From: Markus Theil Subject: [PATCH v5 5/5] igb_uio: release in exact reverse order Date: Thu, 31 Aug 2017 23:47:00 +0200 Message-ID: <1504216020-16067-5-git-send-email-markus.theil@tu-ilmenau.de> References: <1504174949-25656-3-git-send-email-markus.theil@tu-ilmenau.de> <1504216020-16067-1-git-send-email-markus.theil@tu-ilmenau.de> Cc: ferruh.yigit@intel.com, stephen@networkplumber.org, Markus Theil To: dev@dpdk.org Return-path: Received: from smail.rz.tu-ilmenau.de (smail.rz.tu-ilmenau.de [141.24.186.67]) by dpdk.org (Postfix) with ESMTP id D0C9D2C6A for ; Thu, 31 Aug 2017 23:47:23 +0200 (CEST) In-Reply-To: <1504216020-16067-1-git-send-email-markus.theil@tu-ilmenau.de> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Markus Theil --- lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c index 5830453..b578c4a 100644 --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c @@ -493,7 +493,7 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) err = sysfs_create_group(&dev->dev.kobj, &dev_attr_grp); if (err != 0) - goto fail_release_iomem; + goto fail_disable_interrupts; /* register uio driver */ err = uio_register_device(&dev->dev, &udev->info); @@ -530,9 +530,10 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) fail_remove_group: sysfs_remove_group(&dev->dev.kobj, &dev_attr_grp); +fail_disable_interrupts: + igbuio_pci_disable_interrupts(udev); fail_release_iomem: igbuio_pci_release_iomem(&udev->info); - igbuio_pci_disable_interrupts(udev); pci_disable_device(dev); fail_free: kfree(udev); @@ -547,8 +548,8 @@ igbuio_pci_remove(struct pci_dev *dev) sysfs_remove_group(&dev->dev.kobj, &dev_attr_grp); uio_unregister_device(&udev->info); - igbuio_pci_release_iomem(&udev->info); igbuio_pci_disable_interrupts(udev); + igbuio_pci_release_iomem(&udev->info); pci_disable_device(dev); pci_set_drvdata(dev, NULL); kfree(udev); -- 2.7.4