diff options
| author |   visa <visa@openbsd.org> | 2017-08-13 14:46:04 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2017-08-13 14:46:04 +0000 |
| commit | 1e13e0737c5a7d36f66a9f3d353a82696e192327 (patch) | |
| tree | 70656df384fd9fad843a9e43573f23b3bcb21f79 | |
| parent | mention raw SD card offset for U-Boot on Rockchip RK3xxx (diff) | |
| download | wireguard-openbsd-1e13e0737c5a7d36f66a9f3d353a82696e192327.tar.xz wireguard-openbsd-1e13e0737c5a7d36f66a9f3d353a82696e192327.zip | |
Fix a dereference of a bogus pointer.
| -rw-r--r-- | sys/arch/octeon/dev/octohci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arch/octeon/dev/octohci.c b/sys/arch/octeon/dev/octohci.c index 3befa9791a5..1fe457ef7e6 100644 --- a/sys/arch/octeon/dev/octohci.c +++ b/sys/arch/octeon/dev/octohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octohci.c,v 1.2 2017/07/25 11:01:28 jmatthew Exp $ */ +/* $OpenBSD: octohci.c,v 1.3 2017/08/13 14:46:04 visa Exp $ */ /* * Copyright (c) 2015 Jonathan Matthew <jmatthew@openbsd.org> @@ -66,7 +66,6 @@ octohci_attach(struct device *parent, struct device *self, void *aux) { struct octohci_softc *sc = (struct octohci_softc *)self; struct octuctl_attach_args *aa = aux; - char *devname; uint64_t port_ctl; int rc; int s; @@ -94,7 +93,7 @@ octohci_attach(struct device *parent, struct device *self, void *aux) strlcpy(sc->sc_ohci.sc_vendor, "Octeon", sizeof(sc->sc_ohci.sc_vendor)); sc->sc_ih = octeon_intr_establish(CIU_INT_USB, IPL_USB, ohci_intr, - (void *)&sc->sc_ohci, devname); + (void *)&sc->sc_ohci, sc->sc_ohci.sc_bus.bdev.dv_xname); KASSERT(sc->sc_ih != NULL); if ((ohci_checkrev(&sc->sc_ohci) != USBD_NORMAL_COMPLETION) || |