svn commit: r351906 - stable/12/sys/dev/nvme

Warner Losh imp at FreeBSD.org
Thu Sep 5 23:04:38 UTC 2019


Author: imp
Date: Thu Sep  5 23:04:37 2019
New Revision: 351906
URL: https://svnweb.freebsd.org/changeset/base/351906

Log:
  MFC r351403:
  
    Move releasing of resources to later

Modified:
  stable/12/sys/dev/nvme/nvme_pci.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/nvme/nvme_pci.c
==============================================================================
--- stable/12/sys/dev/nvme/nvme_pci.c	Thu Sep  5 23:03:37 2019	(r351905)
+++ stable/12/sys/dev/nvme/nvme_pci.c	Thu Sep  5 23:04:37 2019	(r351906)
@@ -215,11 +215,13 @@ static int
 nvme_pci_detach(device_t dev)
 {
 	struct nvme_controller*ctrlr = DEVICE2SOFTC(dev);
+	int rv;
 
+	rv = nvme_detach(dev);
 	if (ctrlr->msix_enabled)
 		pci_release_msi(dev);
 	pci_disable_busmaster(dev);
-	return (nvme_detach(dev));
+	return (rv);
 }
 
 static int


More information about the svn-src-all mailing list