From owner-svn-src-head@freebsd.org  Fri Sep  7 21:12:38 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 556F6106C641;
 Fri,  7 Sep 2018 21:12:38 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0BB6C77C1B;
 Fri,  7 Sep 2018 21:12:38 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 06B9821447;
 Fri,  7 Sep 2018 21:12:38 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w87LCbVq068323;
 Fri, 7 Sep 2018 21:12:37 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w87LCbZr068322;
 Fri, 7 Sep 2018 21:12:37 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201809072112.w87LCbZr068322@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Fri, 7 Sep 2018 21:12:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r338528 - head/sys/dev/intel
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/sys/dev/intel
X-SVN-Commit-Revision: 338528
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Sep 2018 21:12:38 -0000

Author: markj
Date: Fri Sep  7 21:12:37 2018
New Revision: 338528
URL: https://svnweb.freebsd.org/changeset/base/338528

Log:
  Specify the correct resource type in teardown paths.
  
  Submitted by:	Yuri Pankov <yuripv@yuripv.net>
  Approved by:	re (kib)
  MFC after:	1 week

Modified:
  head/sys/dev/intel/spi.c

Modified: head/sys/dev/intel/spi.c
==============================================================================
--- head/sys/dev/intel/spi.c	Fri Sep  7 21:11:41 2018	(r338527)
+++ head/sys/dev/intel/spi.c	Fri Sep  7 21:12:37 2018	(r338528)
@@ -480,7 +480,7 @@ error:
 		    sc->sc_mem_rid, sc->sc_mem_res);
 
 	if (sc->sc_irq_res != NULL)
-		bus_release_resource(dev, SYS_RES_MEMORY,
+		bus_release_resource(dev, SYS_RES_IRQ,
 		    sc->sc_irq_rid, sc->sc_irq_res);
 
 	return (ENXIO);
@@ -503,7 +503,7 @@ intelspi_detach(device_t dev)
 		    sc->sc_mem_rid, sc->sc_mem_res);
 
 	if (sc->sc_irq_res != NULL)
-		bus_release_resource(dev, SYS_RES_MEMORY,
+		bus_release_resource(dev, SYS_RES_IRQ,
 		    sc->sc_irq_rid, sc->sc_irq_res);
 
 	return (0);