From owner-svn-src-all@FreeBSD.ORG  Wed Jul 18 11:37:00 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 86D52106566C;
	Wed, 18 Jul 2012 11:37:00 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7175A8FC0A;
	Wed, 18 Jul 2012 11:37:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6IBb0rG066218;
	Wed, 18 Jul 2012 11:37:00 GMT
	(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6IBb0K1066216;
	Wed, 18 Jul 2012 11:37:00 GMT
	(envelope-from brueffer@svn.freebsd.org)
Message-Id: <201207181137.q6IBb0K1066216@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Wed, 18 Jul 2012 11:37:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238594 - stable/8/sys/cam/ata
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jul 2012 11:37:00 -0000

Author: brueffer
Date: Wed Jul 18 11:36:59 2012
New Revision: 238594
URL: http://svn.freebsd.org/changeset/base/238594

Log:
  MFC: r238363
  
  - fix description of SECURITY_FREEZE_LOCK
  - add missing underscores to SECURITY_DISABLE_PASSWORD

Modified:
  stable/8/sys/cam/ata/ata_all.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/cam/ata/ata_all.c
==============================================================================
--- stable/8/sys/cam/ata/ata_all.c	Wed Jul 18 10:58:30 2012	(r238593)
+++ stable/8/sys/cam/ata/ata_all.c	Wed Jul 18 11:36:59 2012	(r238594)
@@ -161,8 +161,8 @@ ata_op_string(struct ata_cmd *cmd)
 	case 0xf2: return ("SECURITY_UNLOCK");
 	case 0xf3: return ("SECURITY_ERASE_PREPARE");
 	case 0xf4: return ("SECURITY_ERASE_UNIT");
-	case 0xf5: return ("SECURITY_FREE_LOCK");
-	case 0xf6: return ("SECURITY DISABLE PASSWORD");
+	case 0xf5: return ("SECURITY_FREEZE_LOCK");
+	case 0xf6: return ("SECURITY_DISABLE_PASSWORD");
 	case 0xf8: return ("READ_NATIVE_MAX_ADDRESS");
 	case 0xf9: return ("SET_MAX_ADDRESS");
 	}