From owner-svn-src-stable-9@FreeBSD.ORG  Mon Jun 17 14:21:32 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 [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 9EACDCD7;
 Mon, 17 Jun 2013 14:21:32 +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 798E719CF;
 Mon, 17 Jun 2013 14:21:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HELW1Z010846;
 Mon, 17 Jun 2013 14:21:32 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5HELWGG010845;
 Mon, 17 Jun 2013 14:21:32 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306171421.r5HELWGG010845@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 17 Jun 2013 14:21:32 +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: r251846 - stable/9/sys/cam/ata
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:21:32 -0000

Author: mav
Date: Mon Jun 17 14:21:31 2013
New Revision: 251846
URL: http://svnweb.freebsd.org/changeset/base/251846

Log:
  MFC r249205:
  Replicate r245306 from SCSI to ATA.  The problem didn't appear so far,
  covered by multilevel freeze mechanism, but it is better to be safe.

Modified:
  stable/9/sys/cam/ata/ata_da.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/ata/ata_da.c
==============================================================================
--- stable/9/sys/cam/ata/ata_da.c	Mon Jun 17 13:02:39 2013	(r251845)
+++ stable/9/sys/cam/ata/ata_da.c	Mon Jun 17 14:21:31 2013	(r251846)
@@ -657,6 +657,9 @@ adaschedule(struct cam_periph *periph)
 	struct ada_softc *softc = (struct ada_softc *)periph->softc;
 	uint32_t prio;
 
+	if (softc->state != ADA_STATE_NORMAL)
+		return;
+
 	/* Check if cam_periph_getccb() was called. */
 	prio = periph->immediate_priority;