From owner-svn-src-head@FreeBSD.ORG  Wed Jun 12 16:13:05 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 953B5766;
 Wed, 12 Jun 2013 16:13:05 +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 87DCD193C;
 Wed, 12 Jun 2013 16:13:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CGD5Jc058889;
 Wed, 12 Jun 2013 16:13:05 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CGD5Ol058888;
 Wed, 12 Jun 2013 16:13:05 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306121613.r5CGD5Ol058888@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 12 Jun 2013 16:13:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251659 - head/sbin/camcontrol
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, 12 Jun 2013 16:13:05 -0000

Author: mav
Date: Wed Jun 12 16:13:05 2013
New Revision: 251659
URL: http://svnweb.freebsd.org/changeset/base/251659

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

Modified:
  head/sbin/camcontrol/camcontrol.c

Modified: head/sbin/camcontrol/camcontrol.c
==============================================================================
--- head/sbin/camcontrol/camcontrol.c	Wed Jun 12 15:24:48 2013	(r251658)
+++ head/sbin/camcontrol/camcontrol.c	Wed Jun 12 16:13:05 2013	(r251659)
@@ -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,