From owner-svn-src-projects@FreeBSD.ORG Sat Jun 7 04:55:20 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 37FD2FD6; Sat, 7 Jun 2014 04:55:20 +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 25DE529BD; Sat, 7 Jun 2014 04:55:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s574tKdu085034; Sat, 7 Jun 2014 04:55:20 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s574tKAR085033; Sat, 7 Jun 2014 04:55:20 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201406070455.s574tKAR085033@svn.freebsd.org> From: Justin Hibbits Date: Sat, 7 Jun 2014 04:55:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r267204 - projects/pmac_pmu/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2014 04:55:20 -0000 Author: jhibbits Date: Sat Jun 7 04:55:19 2014 New Revision: 267204 URL: http://svnweb.freebsd.org/changeset/base/267204 Log: Move the state save/restore to the bus_generic_suspend_child/resume_child, where it really belongs. Modified: projects/pmac_pmu/sys/kern/subr_bus.c Modified: projects/pmac_pmu/sys/kern/subr_bus.c ============================================================================== --- projects/pmac_pmu/sys/kern/subr_bus.c Sat Jun 7 03:39:12 2014 (r267203) +++ projects/pmac_pmu/sys/kern/subr_bus.c Sat Jun 7 04:55:19 2014 (r267204) @@ -3643,6 +3643,8 @@ bus_generic_suspend_child(device_t dev, int error; error = DEVICE_SUSPEND(child); + if (!error) + child->state = DS_SUSPENDED; return (error); } @@ -3659,6 +3661,11 @@ bus_generic_resume_child(device_t dev, d int error; error = DEVICE_RESUME(child); + /* + * Regardless of resume state, there's nothing we can do, so mark it + * attached again. + */ + child->state = DS_ATTACHED; return (error); } @@ -3693,15 +3700,13 @@ bus_generic_suspend(device_t dev) error = BUS_SUSPEND_CHILD(dev, child); if (error != 0) printf("Error suspending child %s: %d\n", child->nameunit, error); - if (error == 0) - child->state = DS_SUSPENDED; } } if (error) { for (child2 = TAILQ_FIRST(&dev->children); - child2 && child2 != child; - child2 = TAILQ_NEXT(child2, link)) { + child2 && child2 != child; + child2 = TAILQ_NEXT(child2, link)) { BUS_RESUME_CHILD(dev, child2); bus_generic_resume(child2); } @@ -3729,8 +3734,6 @@ bus_generic_resume(device_t dev) BUS_RESUME_CHILD(dev, child); /* if resume fails, there's nothing we can usefully do... */ - /* Re-mark the child as attached. */ - child->state = DS_ATTACHED; } /* Recurse through the child, resuming all its children. */