From 5f59ea478ec0c061b477ba801a5698513f0418f5 Mon Sep 17 00:00:00 2001 From: Steven Hartland Date: Sun, 21 Dec 2014 16:32:57 +0000 Subject: [PATCH] Return the error from ahci_setup_interrupt in ahci_attach Previously ahci_attach returned a hard coded ENXIO instead of the value from ahci_setup_interrupt. This is effectively a NOOP change as currently ahci_setup_interrupt only ever returns 0 or ENXIO, so just there to protect against any future changes to that. Differential Revision: D838 MFC after: 2 weeks Sponsored by: Multiplay --- sys/dev/ahci/ahci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index 8b4066f5820..35a32c1c269 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -231,12 +231,12 @@ ahci_attach(device_t dev) ahci_ctlr_setup(dev); /* Setup interrupts. */ - if (ahci_setup_interrupt(dev)) { + if ((error = ahci_setup_interrupt(dev)) != 0) { bus_dma_tag_destroy(ctlr->dma_tag); bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem); rman_fini(&ctlr->sc_iomem); - return ENXIO; + return error; } i = 0;