From owner-svn-src-stable-9@FreeBSD.ORG  Mon Jun 17 14:59:23 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 949CF582;
 Mon, 17 Jun 2013 14:59:23 +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 877AF1C3D;
 Mon, 17 Jun 2013 14:59:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HExNj0022102;
 Mon, 17 Jun 2013 14:59:23 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5HExNeW022101;
 Mon, 17 Jun 2013 14:59:23 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306171459.r5HExNeW022101@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 17 Jun 2013 14:59:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251852 - stable/9/sbin/camcontrol
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Jun 2013 14:59:23 -0000

Author: mav
Date: Mon Jun 17 14:59:23 2013
New Revision: 251852
URL: http://svnweb.freebsd.org/changeset/base/251852

Log:
  MFC r251659:
  Use CAM_DIR_NONE for requests without data.
  Wrong values there confuse some drivers.

Modified:
  stable/9/sbin/camcontrol/camcontrol.c
Directory Properties:
  stable/9/sbin/camcontrol/   (props changed)

Modified: stable/9/sbin/camcontrol/camcontrol.c
==============================================================================
--- stable/9/sbin/camcontrol/camcontrol.c	Mon Jun 17 14:56:49 2013	(r251851)
+++ stable/9/sbin/camcontrol/camcontrol.c	Mon Jun 17 14:59:23 2013	(r251852)
@@ -1784,7 +1784,7 @@ ata_read_native_max(struct cam_device *d
 	error = ata_do_cmd(device,
 			   ccb,
 			   retry_count,
-			   /*flags*/CAM_DIR_IN,
+			   /*flags*/CAM_DIR_NONE,
 			   /*protocol*/protocol,
 			   /*ata_flags*/AP_FLAG_CHK_COND,
 			   /*tag_action*/MSG_SIMPLE_Q_TAG,
@@ -1828,7 +1828,7 @@ atahpa_set_max(struct cam_device *device
 	error = ata_do_cmd(device,
 			   ccb,
 			   retry_count,
-			   /*flags*/CAM_DIR_OUT,
+			   /*flags*/CAM_DIR_NONE,
 			   /*protocol*/protocol,
 			   /*ata_flags*/AP_FLAG_CHK_COND,
 			   /*tag_action*/MSG_SIMPLE_Q_TAG,
@@ -1895,7 +1895,7 @@ atahpa_lock(struct cam_device *device, i
 	error = ata_do_cmd(device,
 			   ccb,
 			   retry_count,
-			   /*flags*/CAM_DIR_OUT,
+			   /*flags*/CAM_DIR_NONE,
 			   /*protocol*/protocol,
 			   /*ata_flags*/AP_FLAG_CHK_COND,
 			   /*tag_action*/MSG_SIMPLE_Q_TAG,
@@ -1962,7 +1962,7 @@ atahpa_freeze_lock(struct cam_device *de
 	error = ata_do_cmd(device,
 			   ccb,
 			   retry_count,
-			   /*flags*/CAM_DIR_OUT,
+			   /*flags*/CAM_DIR_NONE,
 			   /*protocol*/protocol,
 			   /*ata_flags*/AP_FLAG_CHK_COND,
 			   /*tag_action*/MSG_SIMPLE_Q_TAG,