svn commit: r291516 - stable/10/sys/dev/isp

[Alexander Motin]

Author: mav
Date: Mon Nov 30 21:41:56 2015
New Revision: 291516
URL: https://svnweb.freebsd.org/changeset/base/291516

Log:
  MFC r291099: Some cosmetics for ancient cards.

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

Modified: stable/10/sys/dev/isp/isp.c
==============================================================================
--- stable/10/sys/dev/isp/isp.c	Mon Nov 30 21:41:06 2015	(r291515)
+++ stable/10/sys/dev/isp/isp.c	Mon Nov 30 21:41:56 2015	(r291516)
@@ -2508,7 +2508,7 @@ isp_port_login(ispsoftc_t *isp, uint16_t
 
 	switch (mbs.param[0]) {
 	case MBOX_PORT_ID_USED:
-		isp_prt(isp, ISP_LOG_SANCFG|ISP_LOG_WARN1, "isp_port_login: portid 0x%06x already logged in as %u", portid, mbs.param[1]);
+		isp_prt(isp, ISP_LOG_SANCFG|ISP_LOG_WARN1, "isp_port_login: portid 0x%06x already logged in as 0x%x", portid, mbs.param[1]);
 		return (MBOX_PORT_ID_USED | (mbs.param[1] << 16));
 
 	case MBOX_LOOP_ID_USED:
@@ -5697,8 +5697,12 @@ isp_parse_async_fc(ispsoftc_t *isp, uint
 	{
 		int echan, nphdl, nlstate, reason;
 
-		nphdl = ISP_READ(isp, OUTMAILBOX1);
-		nlstate = ISP_READ(isp, OUTMAILBOX2);
+		if (IS_23XX(isp) || IS_24XX(isp)) {
+			nphdl = ISP_READ(isp, OUTMAILBOX1);
+			nlstate = ISP_READ(isp, OUTMAILBOX2);
+		} else {
+			nphdl = nlstate = 0xffff;
+		}
 		if (IS_24XX(isp))
 			reason = ISP_READ(isp, OUTMAILBOX3) >> 8;
 		else