From owner-svn-src-all@freebsd.org  Wed Mar  8 14:52:04 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9FF9BD0202B;
 Wed,  8 Mar 2017 14:52:04 +0000 (UTC)
 (envelope-from mmel@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 mx1.freebsd.org (Postfix) with ESMTPS id 54DB21B31;
 Wed,  8 Mar 2017 14:52:04 +0000 (UTC)
 (envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v28Eq3Hu093974;
 Wed, 8 Mar 2017 14:52:03 GMT (envelope-from mmel@FreeBSD.org)
Received: (from mmel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v28Eq3bI093973;
 Wed, 8 Mar 2017 14:52:03 GMT (envelope-from mmel@FreeBSD.org)
Message-Id: <201703081452.v28Eq3bI093973@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmel set sender to
 mmel@FreeBSD.org using -f
From: Michal Meloun <mmel@FreeBSD.org>
Date: Wed, 8 Mar 2017 14:52:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314914 - head/sys/dev/sdhci
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.23
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Mar 2017 14:52:04 -0000

Author: mmel
Date: Wed Mar  8 14:52:03 2017
New Revision: 314914
URL: https://svnweb.freebsd.org/changeset/base/314914

Log:
  Release all previously allocated resources.

Modified:
  head/sys/dev/sdhci/sdhci_fdt_gpio.c

Modified: head/sys/dev/sdhci/sdhci_fdt_gpio.c
==============================================================================
--- head/sys/dev/sdhci/sdhci_fdt_gpio.c	Wed Mar  8 13:52:45 2017	(r314913)
+++ head/sys/dev/sdhci/sdhci_fdt_gpio.c	Wed Mar  8 14:52:03 2017	(r314914)
@@ -220,9 +220,14 @@ sdhci_fdt_gpio_teardown(struct sdhci_fdt
 	if (gpio == NULL)
 		return;
 
-	if (gpio->cd_ihandler != NULL) {
+	if (gpio->cd_ihandler != NULL)
 		bus_teardown_intr(gpio->dev, gpio->cd_ires, gpio->cd_ihandler);
-	}
+	if (gpio->wp_pin != NULL)
+		gpio_pin_release(gpio->wp_pin);
+	if (gpio->cd_pin != NULL)
+		gpio_pin_release(gpio->cd_pin);
+	if (gpio->cd_ires != NULL)
+		bus_release_resource(gpio->dev, SYS_RES_IRQ, 0, gpio->cd_ires);
 
 	free(gpio, M_DEVBUF);
 }