From owner-svn-src-all@freebsd.org  Thu Apr 19 15:29:11 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A31EF843F7;
 Thu, 19 Apr 2018 15:29:11 +0000 (UTC) (envelope-from mav@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 3D9846DEDB;
 Thu, 19 Apr 2018 15:29:11 +0000 (UTC) (envelope-from mav@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 389DE38F2;
 Thu, 19 Apr 2018 15:29:11 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3JFTBmv062048;
 Thu, 19 Apr 2018 15:29:11 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3JFTBAx062047;
 Thu, 19 Apr 2018 15:29:11 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201804191529.w3JFTBAx062047@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 19 Apr 2018 15:29:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r332779 - head/sys/powerpc/powermac
X-SVN-Group: head
X-SVN-Commit-Author: mav
X-SVN-Commit-Paths: head/sys/powerpc/powermac
X-SVN-Commit-Revision: 332779
X-SVN-Commit-Repository: base
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.25
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: Thu, 19 Apr 2018 15:29:11 -0000

Author: mav
Date: Thu Apr 19 15:29:10 2018
New Revision: 332779
URL: https://svnweb.freebsd.org/changeset/base/332779

Log:
  Release memory resource on cuda driver attach failure.
  
  Submitted by:	Dmitry Luhtionov <dmitryluhtionov@gmail.com>

Modified:
  head/sys/powerpc/powermac/cuda.c

Modified: head/sys/powerpc/powermac/cuda.c
==============================================================================
--- head/sys/powerpc/powermac/cuda.c	Thu Apr 19 15:24:21 2018	(r332778)
+++ head/sys/powerpc/powermac/cuda.c	Thu Apr 19 15:29:10 2018	(r332779)
@@ -165,12 +165,16 @@ cuda_attach(device_t dev)
             	RF_ACTIVE);
         if (sc->sc_irq == NULL) {
                 device_printf(dev, "could not allocate interrupt\n");
+                bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_memrid,
+                    sc->sc_memr);
                 return (ENXIO);
         }
 
 	if (bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_MISC | INTR_MPSAFE 
 	    | INTR_ENTROPY, NULL, cuda_intr, dev, &sc->sc_ih) != 0) {
                 device_printf(dev, "could not setup interrupt\n");
+                bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_memrid,
+                    sc->sc_memr);
                 bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irqrid,
                     sc->sc_irq);
                 return (ENXIO);