diff options
| author |   krw <krw@openbsd.org> | 2020-07-11 23:41:51 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-07-11 23:41:51 +0000 |
| commit | 61db9d940b14c668cf656a74d77e2374aa498691 (patch) | |
| tree | e0cc32029091cd014ba44527faf4836e0c0aa850 | |
| parent | timekeep_sz now already includes the round_page() adjustment; ok kettenis@ (diff) | |
| download | wireguard-openbsd-61db9d940b14c668cf656a74d77e2374aa498691.tar.xz wireguard-openbsd-61db9d940b14c668cf656a74d77e2374aa498691.zip | |
Revert previous. Broke something somehow.
| -rw-r--r-- | sys/dev/ic/nvme.c | 5 | ||||
| -rw-r--r-- | sys/dev/ic/nvmevar.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/ic/nvme.c b/sys/dev/ic/nvme.c index 5933131d13f..dd3b9aee428 100644 --- a/sys/dev/ic/nvme.c +++ b/sys/dev/ic/nvme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvme.c,v 1.78 2020/07/11 20:06:04 krw Exp $ */ +/* $OpenBSD: nvme.c,v 1.79 2020/07/11 23:41:51 krw Exp $ */ /* * Copyright (c) 2014 David Gwynne <dlg@openbsd.org> @@ -373,7 +373,8 @@ nvme_attach(struct nvme_softc *sc) saa.saa_sc_link = &sc->sc_link; - config_found(&sc->sc_dev, &saa, scsiprint); + sc->sc_scsibus = (struct scsibus_softc *)config_found(&sc->sc_dev, + &saa, scsiprint); return (0); diff --git a/sys/dev/ic/nvmevar.h b/sys/dev/ic/nvmevar.h index 08da0f7dbc3..9758d2c01fc 100644 --- a/sys/dev/ic/nvmevar.h +++ b/sys/dev/ic/nvmevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nvmevar.h,v 1.17 2020/07/11 20:06:04 krw Exp $ */ +/* $OpenBSD: nvmevar.h,v 1.18 2020/07/11 23:41:51 krw Exp $ */ /* * Copyright (c) 2014 David Gwynne <dlg@openbsd.org> @@ -102,6 +102,7 @@ struct nvme_softc { struct scsi_iopool sc_iopool; struct scsi_link sc_link; + struct scsibus_softc *sc_scsibus; }; int nvme_attach(struct nvme_softc *); |