From owner-svn-src-all@FreeBSD.ORG  Thu Feb  5 22:24:23 2015
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:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F283AA3;
 Thu,  5 Feb 2015 22:24:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DF0D27F6;
 Thu,  5 Feb 2015 22:24:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15MOMgY086970;
 Thu, 5 Feb 2015 22:24:22 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15MOMCR086969;
 Thu, 5 Feb 2015 22:24:22 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201502052224.t15MOMCR086969@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 5 Feb 2015 22:24:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278296 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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, 05 Feb 2015 22:24:23 -0000

Author: jhb
Date: Thu Feb  5 22:24:22 2015
New Revision: 278296
URL: https://svnweb.freebsd.org/changeset/base/278296

Log:
  Set and clear the DF_SUSPENDED flag on the child device being manipulated
  rather than on the parent.

Modified:
  head/sys/kern/subr_bus.c

Modified: head/sys/kern/subr_bus.c
==============================================================================
--- head/sys/kern/subr_bus.c	Thu Feb  5 22:03:12 2015	(r278295)
+++ head/sys/kern/subr_bus.c	Thu Feb  5 22:24:22 2015	(r278296)
@@ -3653,7 +3653,7 @@ bus_generic_suspend_child(device_t dev, 
 	error = DEVICE_SUSPEND(child);
 
 	if (error == 0)
-		dev->flags |= DF_SUSPENDED;
+		child->flags |= DF_SUSPENDED;
 
 	return (error);
 }
@@ -3668,7 +3668,7 @@ bus_generic_resume_child(device_t dev, d
 {
 
 	DEVICE_RESUME(child);
-	dev->flags &= ~DF_SUSPENDED;
+	child->flags &= ~DF_SUSPENDED;
 
 	return (0);
 }