From owner-svn-src-head@FreeBSD.ORG  Wed Dec 19 09:55:13 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C53A2300;
 Wed, 19 Dec 2012 09:55:13 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A8E0E8FC16;
 Wed, 19 Dec 2012 09:55:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJ9tDwS064177;
 Wed, 19 Dec 2012 09:55:13 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJ9tDrS064176;
 Wed, 19 Dec 2012 09:55:13 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212190955.qBJ9tDrS064176@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 19 Dec 2012 09:55:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244418 - head/sys/cam/scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 09:55:13 -0000

Author: mav
Date: Wed Dec 19 09:55:13 2012
New Revision: 244418
URL: http://svnweb.freebsd.org/changeset/base/244418

Log:
  Fix bug in r242720, that caused additional status page to not be used if
  descriptor page is supported.

Modified:
  head/sys/cam/scsi/scsi_enc_ses.c

Modified: head/sys/cam/scsi/scsi_enc_ses.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc_ses.c	Wed Dec 19 05:07:27 2012	(r244417)
+++ head/sys/cam/scsi/scsi_enc_ses.c	Wed Dec 19 09:55:13 2012	(r244418)
@@ -1272,13 +1272,10 @@ ses_process_pages(enc_softc_t *enc, stru
 
 	err = 0;
 	for (i = 0; i < length; i++) {
-		if (page->params[i] == SesElementDescriptor) {
+		if (page->params[i] == SesElementDescriptor)
 			ses->ses_flags |= SES_FLAG_DESC;
-			break;
-		} else if (page->params[i] == SesAddlElementStatus) {
+		else if (page->params[i] == SesAddlElementStatus)
 			ses->ses_flags |= SES_FLAG_ADDLSTATUS;
-			break;
-		}
 	}
 
 out: