diff options
| author | jimharris <jimharris@FreeBSD.org> | 2016-02-29 15:45:43 +0000 |
|---|---|---|
| committer | jimharris <jimharris@FreeBSD.org> | 2016-02-29 15:45:43 +0000 |
| commit | 74f3aa2e27c540754f25f7a5eac0f805d757bf3d (patch) | |
| tree | 5a947ae065dfbc7dff4929db46e1edb4d4c805bb /sys/dev | |
| parent | 15dc3e2435d0a1243a7938c5eda77de938e4f5de (diff) | |
| download | FreeBSD-src-74f3aa2e27c540754f25f7a5eac0f805d757bf3d.zip FreeBSD-src-74f3aa2e27c540754f25f7a5eac0f805d757bf3d.tar.gz | |
MFC r295944:
nvme: fix intx handler to not dereference ioq during initialization
This was a regression from r293328, which deferred allocation
of the controller's ioq array until after interrupts are enabled
during boot.
Approved by: re (gjb)
Sponsored by: Intel
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/nvme/nvme_ctrlr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 991c52f..fbcd306 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -810,7 +810,7 @@ nvme_ctrlr_intx_handler(void *arg) nvme_qpair_process_completions(&ctrlr->adminq); - if (ctrlr->ioq[0].cpl) + if (ctrlr->ioq && ctrlr->ioq[0].cpl) nvme_qpair_process_completions(&ctrlr->ioq[0]); nvme_mmio_write_4(ctrlr, intmc, 1); |
