svn commit: r296191 - stable/10/sys/dev/nvme

[Jim Harris]

Author: jimharris
Date: Mon Feb 29 15:45:43 2016
New Revision: 296191
URL: https://svnweb.freebsd.org/changeset/base/296191

Log:
  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

Modified:
  stable/10/sys/dev/nvme/nvme_ctrlr.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/nvme/nvme_ctrlr.c
==============================================================================
--- stable/10/sys/dev/nvme/nvme_ctrlr.c	Mon Feb 29 14:46:39 2016	(r296190)
+++ stable/10/sys/dev/nvme/nvme_ctrlr.c	Mon Feb 29 15:45:43 2016	(r296191)
@@ -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);