Date: Sun, 21 Dec 2014 16:32:58 +0000 (UTC) From: Steven Hartland <smh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276016 - head/sys/dev/ahci Message-ID: <201412211632.sBLGWwCO019226@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: smh Date: Sun Dec 21 16:32:57 2014 New Revision: 276016 URL: https://svnweb.freebsd.org/changeset/base/276016 Log: 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 Modified: head/sys/dev/ahci/ahci.c Modified: head/sys/dev/ahci/ahci.c ============================================================================== --- head/sys/dev/ahci/ahci.c Sun Dec 21 16:21:56 2014 (r276015) +++ head/sys/dev/ahci/ahci.c Sun Dec 21 16:32:57 2014 (r276016) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412211632.sBLGWwCO019226>