From owner-svn-src-all@FreeBSD.ORG  Tue Jul 13 06:42:47 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7AABF1065670;
	Tue, 13 Jul 2010 06:42:47 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A0E08FC16;
	Tue, 13 Jul 2010 06:42:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6D6gl0a045178;
	Tue, 13 Jul 2010 06:42:47 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6D6gltn045176;
	Tue, 13 Jul 2010 06:42:47 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201007130642.o6D6gltn045176@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 13 Jul 2010 06:42:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209977 - head/sys/dev/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: Tue, 13 Jul 2010 06:42:47 -0000

Author: mav
Date: Tue Jul 13 06:42:47 2010
New Revision: 209977
URL: http://svn.freebsd.org/changeset/base/209977

Log:
  Disable multi-sector PIO transfers if ATA_SET_MULTI command failed.
  
  Submitted by:	Mikolaj Golub on fs@

Modified:
  head/sys/dev/ata/ata-disk.c

Modified: head/sys/dev/ata/ata-disk.c
==============================================================================
--- head/sys/dev/ata/ata-disk.c	Tue Jul 13 05:43:43 2010	(r209976)
+++ head/sys/dev/ata/ata-disk.c	Tue Jul 13 06:42:47 2010	(r209977)
@@ -406,6 +406,8 @@ ad_init(device_t dev)
 
 	if (!ata_controlcmd(dev, ATA_SET_MULTI, 0, 0, secsperint))
 	    atadev->max_iosize = secsperint * DEV_BSIZE;
+	else
+	    atadev->max_iosize = DEV_BSIZE;
     }
     else
 	atadev->max_iosize = DEV_BSIZE;