From owner-svn-src-all@FreeBSD.ORG  Thu Oct 30 13:18:28 2008
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 81E34106567D;
	Thu, 30 Oct 2008 13:18:28 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6EF448FC18;
	Thu, 30 Oct 2008 13:18:28 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9UDISLl052393;
	Thu, 30 Oct 2008 13:18:28 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9UDISbZ052392;
	Thu, 30 Oct 2008 13:18:28 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200810301318.m9UDISbZ052392@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 30 Oct 2008 13:18:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184470 - in releng/6.4/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: Thu, 30 Oct 2008 13:18:28 -0000

Author: kib
Date: Thu Oct 30 13:18:28 2008
New Revision: 184470
URL: http://svn.freebsd.org/changeset/base/184470

Log:
  MFC of the r179312 by sos:
  Do not call ata_start() when ata_reinit fails in the ioctl path.
  
  Approved by:	re (kensmith), sos
  Prodded by:	Andrey V. Elsukov <bu7cher@yandex.ru>

Modified:
  releng/6.4/sys/   (props changed)
  releng/6.4/sys/dev/ata/ata-all.c

Modified: releng/6.4/sys/dev/ata/ata-all.c
==============================================================================
--- releng/6.4/sys/dev/ata/ata-all.c	Thu Oct 30 13:14:45 2008	(r184469)
+++ releng/6.4/sys/dev/ata/ata-all.c	Thu Oct 30 13:18:28 2008	(r184470)
@@ -375,7 +375,6 @@ ata_ioctl(struct cdev *dev, u_long cmd, 
 	    !(device = devclass_get_device(ata_devclass, *value)))
 	    return ENXIO;
 	error = ata_reinit(device);
-	ata_start(device);
 	break;
 
     case IOCATAATTACH: