Date: Sat, 15 Jun 2019 09:25:40 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r349050 - stable/12/sys/mips/cavium/usb Message-ID: <201906150925.x5F9PeMp088015@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Sat Jun 15 09:25:40 2019 New Revision: 349050 URL: https://svnweb.freebsd.org/changeset/base/349050 Log: MFC r348497: octusb: fix detach loop over USB ports Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/mips/cavium/usb/octusb_octeon.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/mips/cavium/usb/octusb_octeon.c ============================================================================== --- stable/12/sys/mips/cavium/usb/octusb_octeon.c Sat Jun 15 09:15:58 2019 (r349049) +++ stable/12/sys/mips/cavium/usb/octusb_octeon.c Sat Jun 15 09:25:40 2019 (r349050) @@ -179,12 +179,12 @@ octusb_octeon_detach(device_t dev) if (nports > OCTUSB_MAX_PORTS) panic("octusb: too many USB ports %d", nports); for (i = 0; i < nports; i++) { - if (sc->sc_dci.sc_irq_res[0] && sc->sc_dci.sc_intr_hdl[0]) { + if (sc->sc_dci.sc_irq_res[i] && sc->sc_dci.sc_intr_hdl[i]) { err = bus_teardown_intr(dev, sc->sc_dci.sc_irq_res[i], sc->sc_dci.sc_intr_hdl[i]); sc->sc_dci.sc_intr_hdl[i] = NULL; } - if (sc->sc_dci.sc_irq_res) { + if (sc->sc_dci.sc_irq_res[i]) { bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_dci.sc_irq_res[i]); sc->sc_dci.sc_irq_res[i] = NULL;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906150925.x5F9PeMp088015>