Date: Tue, 4 Feb 2020 18:29:07 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357509 - head/sys/dev/atkbdc Message-ID: <202002041829.014IT7pi016147@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Tue Feb 4 18:29:06 2020 New Revision: 357509 URL: https://svnweb.freebsd.org/changeset/base/357509 Log: psm: release resources on attach failure In exactly 1/3 cases we'll release resources on failure; touch up the other two to do so as well. Modified: head/sys/dev/atkbdc/psm.c Modified: head/sys/dev/atkbdc/psm.c ============================================================================== --- head/sys/dev/atkbdc/psm.c Tue Feb 4 17:17:40 2020 (r357508) +++ head/sys/dev/atkbdc/psm.c Tue Feb 4 18:29:06 2020 (r357509) @@ -1965,10 +1965,8 @@ psmattach(device_t dev) return (ENXIO); error = bus_setup_intr(dev, sc->intr, INTR_TYPE_TTY, NULL, psmintr, sc, &sc->ih); - if (error) { - bus_release_resource(dev, SYS_RES_IRQ, rid, sc->intr); - return (error); - } + if (error) + goto out; /* Done */ sc->dev = make_dev(&psm_cdevsw, 0, 0, 0, 0666, "psm%d", unit); @@ -1991,7 +1989,7 @@ psmattach(device_t dev) } if (error) - return (error); + goto out; #endif /* Some touchpad devices need full reinitialization after suspend. */ @@ -2032,7 +2030,10 @@ psmattach(device_t dev) if (bootverbose) --verbose; - return (0); +out: + if (error != 0) + bus_release_resource(dev, SYS_RES_IRQ, rid, sc->intr); + return (error); } static int
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002041829.014IT7pi016147>