summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxinhui.pan <xinhuiX.pan@intel.com>2014-01-31 13:08:01 -0800
committerLinus Walleij <linus.walleij@linaro.org>2014-02-05 10:37:06 +0100
commit84a34575fe7c87278e4e00f016aa5b624dcb9171 (patch)
tree9c988d1e2cafdb659b19fdd422881d008ab78bf3
parentcffcc92e966911e3ea9320fac943f545a353f2e0 (diff)
downloadlinux-84a34575fe7c87278e4e00f016aa5b624dcb9171.tar.gz
linux-84a34575fe7c87278e4e00f016aa5b624dcb9171.tar.bz2
linux-84a34575fe7c87278e4e00f016aa5b624dcb9171.zip
gpio: intel-mid: fix the incorrect return of idle callback
intel_gpio_runtime_idle should return correct error code if it do fail. make it more correct even though -EBUSY is the most possible return value. Signed-off-by: bo.he <bo.he@intel.com> Signed-off-by: xinhui.pan <xinhuiX.pan@intel.com> Signed-off-by: David Cohen <david.a.cohen@linux.intel.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpio-intel-mid.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-intel-mid.c b/drivers/gpio/gpio-intel-mid.c
index d1b50ef5fab8..e585163f1ad5 100644
--- a/drivers/gpio/gpio-intel-mid.c
+++ b/drivers/gpio/gpio-intel-mid.c
@@ -394,8 +394,8 @@ static const struct irq_domain_ops intel_gpio_irq_ops = {
static int intel_gpio_runtime_idle(struct device *dev)
{
- pm_schedule_suspend(dev, 500);
- return -EBUSY;
+ int err = pm_schedule_suspend(dev, 500);
+ return err ?: -EBUSY;
}
static const struct dev_pm_ops intel_gpio_pm_ops = {