From owner-svn-src-stable-6@FreeBSD.ORG  Thu Oct 30 13:10:33 2008
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A67AC106564A;
	Thu, 30 Oct 2008 13:10:33 +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 92B118FC24;
	Thu, 30 Oct 2008 13:10:33 +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 m9UDAXMj052163;
	Thu, 30 Oct 2008 13:10:33 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9UDAXm0052162;
	Thu, 30 Oct 2008 13:10:33 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200810301310.m9UDAXm0052162@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 30 Oct 2008 13:10:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184468 - in stable/6/sys: . dev/ata
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Oct 2008 13:10:33 -0000

Author: kib
Date: Thu Oct 30 13:10:33 2008
New Revision: 184468
URL: http://svn.freebsd.org/changeset/base/184468

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:
  stable/6/sys/   (props changed)
  stable/6/sys/dev/ata/ata-all.c

Modified: stable/6/sys/dev/ata/ata-all.c
==============================================================================
--- stable/6/sys/dev/ata/ata-all.c	Thu Oct 30 10:13:53 2008	(r184467)
+++ stable/6/sys/dev/ata/ata-all.c	Thu Oct 30 13:10:33 2008	(r184468)
@@ -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: