Module Name: src Committed By: nonaka Date: Tue Oct 28 02:49:52 UTC 2014
Modified Files: src/sys/dev/pci/hdaudio: hdaudio_pci.c Log Message: disestalish interrupt and unmap register when attach failed. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/hdaudio/hdaudio_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/hdaudio/hdaudio_pci.c diff -u src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.12 src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.13 --- src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.12 Sat Mar 29 19:28:25 2014 +++ src/sys/dev/pci/hdaudio/hdaudio_pci.c Tue Oct 28 02:49:52 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: hdaudio_pci.c,v 1.12 2014/03/29 19:28:25 christos Exp $ */ +/* $NetBSD: hdaudio_pci.c,v 1.13 2014/10/28 02:49:52 nonaka Exp $ */ /* * Copyright (c) 2009 Precedence Technologies Ltd <supp...@precedence.co.uk> @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.12 2014/03/29 19:28:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.13 2014/10/28 02:49:52 nonaka Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -162,7 +162,17 @@ hdaudio_pci_attach(device_t parent, devi hdaudio_pci_reinit(sc); /* Attach bus-independent HD audio layer */ - hdaudio_attach(self, &sc->sc_hdaudio); + if (hdaudio_attach(self, &sc->sc_hdaudio)) { + pci_intr_disestablish(sc->sc_pc, sc->sc_ih); + sc->sc_ih = NULL; + bus_space_unmap(sc->sc_hdaudio.sc_memt, + sc->sc_hdaudio.sc_memh, + sc->sc_hdaudio.sc_memsize); + sc->sc_hdaudio.sc_memvalid = false; + csr = pci_conf_read(sc->sc_pc, sc->sc_tag, PCI_COMMAND_STATUS_REG); + csr &= ~(PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_BACKTOBACK_ENABLE); + pci_conf_write(sc->sc_pc, sc->sc_tag, PCI_COMMAND_STATUS_REG, csr); + } } static int