diff options
author | Renato Botelho <renato@netgate.com> | 2016-03-02 14:39:21 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-03-02 14:39:21 -0300 |
commit | 065e672a01ab2d9ebfed1dccb588be99bd5bc73a (patch) | |
tree | d9dac06d252aac65ba30921226a2f5f5d63c1bb1 /sys/dev/nvme/nvme_ctrlr.c | |
parent | b4655eb4fab0c00a03febe9ef8caad97c0026fe5 (diff) | |
parent | 73af9669cdc04af0c06344ce6f0d85808187eab3 (diff) | |
download | FreeBSD-src-065e672a01ab2d9ebfed1dccb588be99bd5bc73a.zip FreeBSD-src-065e672a01ab2d9ebfed1dccb588be99bd5bc73a.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/dev/nvme/nvme_ctrlr.c')
-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); |