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

[Alexander Motin]

Author: mav
Date: Wed Dec  3 07:04:28 2014
New Revision: 275443
URL: https://svnweb.freebsd.org/changeset/base/275443

Log:
  MFC r275123: Fix incorrect check, blocking MULTIID functionality.

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	Wed Dec  3 07:02:48 2014	(r275442)
+++ stable/10/sys/dev/isp/isp.c	Wed Dec  3 07:04:28 2014	(r275443)
@@ -1219,7 +1219,7 @@ isp_reset(ispsoftc_t *isp, int do_load_d
 	 * work for them).
 	 */
 	if (IS_FC(isp) && isp->isp_nchan > 1) {
-		if (!IS_24XX(isp) || (fwt & ISP2400_FW_ATTR_MULTIID) == 0) {
+		if (!ISP_CAP_MULTI_ID(isp)) {
 			isp_prt(isp, ISP_LOGWARN, "non-MULTIID f/w loaded, only can enable 1 of %d channels", isp->isp_nchan);
 			isp->isp_nchan = 1;
 		}