svn commit: r314763 - stable/10/sys/cam/ctl

Alexander Motin mav at FreeBSD.org
Mon Mar 6 06:43:19 UTC 2017


Author: mav
Date: Mon Mar  6 06:43:17 2017
New Revision: 314763
URL: https://svnweb.freebsd.org/changeset/base/314763

Log:
  MFC r314496: Add check missed in r314257.

Modified:
  stable/10/sys/cam/ctl/ctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c	Mon Mar  6 06:42:47 2017	(r314762)
+++ stable/10/sys/cam/ctl/ctl.c	Mon Mar  6 06:43:17 2017	(r314763)
@@ -9540,7 +9540,7 @@ ctl_inquiry_evpd_devid(struct ctl_scsiio
 
 	if (port && port->port_type == CTL_PORT_FC)
 		proto = SCSI_PROTO_FC << 4;
-	else if (port->port_type == CTL_PORT_SAS)
+	else if (port && port->port_type == CTL_PORT_SAS)
 		proto = SCSI_PROTO_SAS << 4;
 	else if (port && port->port_type == CTL_PORT_ISCSI)
 		proto = SCSI_PROTO_ISCSI << 4;


More information about the svn-src-stable-10 mailing list