D52889.diff
No OneTemporary
Actions

Size

758 B

Referenced Files

None

Subscribers

None

D52889.diff
View Options

	diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c
	--- a/sys/dev/ahci/ahci_pci.c
	+++ b/sys/dev/ahci/ahci_pci.c
	@@ -576,8 +576,8 @@
	ctlr->r_msix_table = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
	&ctlr->r_msix_tab_rid, RF_ACTIVE);
	if (ctlr->r_msix_table == NULL) {
	- ahci_free_mem(dev);
	- return (ENXIO);
	+ msix_count = 0;
	+ goto no_msix;
	}
	}

	@@ -592,12 +592,12 @@
	ctlr->r_msix_pba = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
	&ctlr->r_msix_pba_rid, RF_ACTIVE);
	if (ctlr->r_msix_pba == NULL) {
	- ahci_free_mem(dev);
	- return (ENXIO);
	+ msix_count = 0;
	}
	}
	}

	+no_msix:
	pci_enable_busmaster(dev);
	/* Reset controller */
	if ((error = ahci_pci_ctlr_reset(dev)) != 0) {