From 85bcac416ac6a59d50443891b6afd6f31d4bb0c6 Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Wed, 12 Oct 2011 22:59:33 +0200 Subject: [PATCH] --- yaml --- r: 267075 b: refs/heads/master c: 857b36c7b038ac56a882ee914df93e5985443074 h: refs/heads/master i: 267073: a6ddf24ef61ce58a6640ccdf69c23f5238e95b32 267071: bc4d8db97b5fa0501e4eca806bf0b05499424cbb v: v3 --- [refs] | 2 +- trunk/drivers/base/power/runtime.c | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 99fed60581bd..602e212e27f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47d8f0bac0fda4c15a030f92cd6da6c6bed87459 +refs/heads/master: 857b36c7b038ac56a882ee914df93e5985443074 diff --git a/trunk/drivers/base/power/runtime.c b/trunk/drivers/base/power/runtime.c index aa23a64ea33b..6bb3aafa85ed 100644 --- a/trunk/drivers/base/power/runtime.c +++ b/trunk/drivers/base/power/runtime.c @@ -291,11 +291,11 @@ static int rpm_callback(int (*cb)(struct device *), struct device *dev) * another suspend has been started earlier, either return immediately * or wait for it to finish, depending on the RPM_NOWAIT and RPM_ASYNC * flags. If the RPM_ASYNC flag is set then queue a suspend request; - * otherwise run the ->runtime_suspend() callback directly. If a deferred - * resume was requested while the callback was running then carry it out; - * otherwise send an idle notification for its parent (if the suspend - * succeeded and both ignore_children of parent->power and irq_safe of - * dev->power are not set). + * otherwise run the ->runtime_suspend() callback directly. When + * ->runtime_suspend succeeded, if a deferred resume was requested while + * the callback was running then carry it out, otherwise send an idle + * notification for its parent (if the suspend succeeded and both + * ignore_children of parent->power and irq_safe of dev->power are not set). * * This function must be called under dev->power.lock with interrupts disabled. */ @@ -420,15 +420,16 @@ static int rpm_suspend(struct device *dev, int rpmflags) dev->power.runtime_error = 0; else pm_runtime_cancel_pending(dev); - } else { + wake_up_all(&dev->power.wait_queue); + goto out; + } no_callback: - __update_runtime_status(dev, RPM_SUSPENDED); - pm_runtime_deactivate_timer(dev); + __update_runtime_status(dev, RPM_SUSPENDED); + pm_runtime_deactivate_timer(dev); - if (dev->parent) { - parent = dev->parent; - atomic_add_unless(&parent->power.child_count, -1, 0); - } + if (dev->parent) { + parent = dev->parent; + atomic_add_unless(&parent->power.child_count, -1, 0); } wake_up_all(&dev->power.wait_queue);