Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Apr 2018 15:29:11 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r332779 - head/sys/powerpc/powermac
Message-ID:  <201804191529.w3JFTBAx062047@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804191529.w3JFTBAx062047>