Message ID | 6E3BC7F7C9A4BF4286DD4C043110F30B59E040012A@shsmsx502.ccr.corp.intel.com (mailing list archive) |
---|---|
State | Accepted, archived |
Headers | show |
On Friday, July 08, 2011, Liu, ShuoX wrote: > From 10bb3c851a0a9c9ca4d552743a371e3cfda81075 Mon Sep 17 00:00:00 2001 > From: ShuoX Liu <shuox.liu@intel.com> > Date: Thu, 7 Jul 2011 15:59:06 +0800 > Subject: [PATCH] runtime-pm: consistent utilization of deferred_resume > > dev->power.deferred_resume is used as a bool typically, so change > one assignment to false from 0, like other places. > > Signed-off-by: ShuoX Liu <shuox.liu@intel.com> Applied to suspend-2.6/linux-next, will push for 3.1. Thanks, Rafael > --- > drivers/base/power/runtime.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c > index 0d4587b..af3d1a5 100644 > --- a/drivers/base/power/runtime.c > +++ b/drivers/base/power/runtime.c > @@ -388,7 +388,7 @@ static int rpm_suspend(struct device *dev, int rpmflags) > retval = rpm_callback(callback, dev); > if (retval) { > __update_runtime_status(dev, RPM_ACTIVE); > - dev->power.deferred_resume = 0; > + dev->power.deferred_resume = false; > if (retval == -EAGAIN || retval == -EBUSY) > dev->power.runtime_error = 0; > else >
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 0d4587b..af3d1a5 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -388,7 +388,7 @@ static int rpm_suspend(struct device *dev, int rpmflags) retval = rpm_callback(callback, dev); if (retval) { __update_runtime_status(dev, RPM_ACTIVE); - dev->power.deferred_resume = 0; + dev->power.deferred_resume = false; if (retval == -EAGAIN || retval == -EBUSY) dev->power.runtime_error = 0; else