From owner-svn-src-all@FreeBSD.ORG  Sun Dec 21 16:32:58 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DB3B3FE;
 Sun, 21 Dec 2014 16:32:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C79183030;
 Sun, 21 Dec 2014 16:32:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBLGWwwH019227;
 Sun, 21 Dec 2014 16:32:58 GMT (envelope-from smh@FreeBSD.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBLGWwCO019226;
 Sun, 21 Dec 2014 16:32:58 GMT (envelope-from smh@FreeBSD.org)
Message-Id: <201412211632.sBLGWwCO019226@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org
 using -f
From: Steven Hartland <smh@FreeBSD.org>
Date: Sun, 21 Dec 2014 16:32:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276016 - head/sys/dev/ahci
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Dec 2014 16:32:59 -0000

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;