OSDN Git Service

PM / Runtime: Fix rpm_resume() return value for power.no_callbacks set
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 15 Aug 2012 19:31:45 +0000 (21:31 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Fri, 17 Aug 2012 17:36:35 +0000 (19:36 +0200)
commit7f321c26c04807834fef4c524d2b21573423fc74
treef7e0f198e30d86797b112388f76ca1064a3d4cf6
parentd9875690d9b89a866022ff49e3fcea892345ad92
PM / Runtime: Fix rpm_resume() return value for power.no_callbacks set

For devices whose power.no_callbacks flag is set, rpm_resume()
should return 1 if the device's parent is already active, so that
the callers of pm_runtime_get() don't think that they have to wait
for the device to resume (asynchronously) in that case (the core
won't queue up an asynchronous resume in that case, so there's
nothing to wait for anyway).

Modify the code accordingly (and make sure that an idle notification
will be queued up on success, even if 1 is to be returned).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable@vger.kernel.org
drivers/base/power/runtime.c