diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-03-14 05:26:45 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-03-14 05:26:45 -0400 |
| commit | 9e294427f6e427dbaf46140303acded06365f53c (patch) | |
| tree | 0669100cbd79fe8612463900171c98873d8dc454 /drivers/gpio/gpio-intel-mid.c | |
| parent | 23600969ff137cf4c3bc9098f77e381de334e3f7 (diff) | |
| parent | fa389e220254c69ffae0d403eac4146171062d08 (diff) | |
Merge tag 'v3.14-rc6' into devel
Linux 3.14-rc6
Diffstat (limited to 'drivers/gpio/gpio-intel-mid.c')
| -rw-r--r-- | drivers/gpio/gpio-intel-mid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-intel-mid.c b/drivers/gpio/gpio-intel-mid.c index 62860d703385..3a34bb151fd4 100644 --- a/drivers/gpio/gpio-intel-mid.c +++ b/drivers/gpio/gpio-intel-mid.c | |||
| @@ -390,8 +390,8 @@ static const struct irq_domain_ops intel_gpio_irq_ops = { | |||
| 390 | 390 | ||
| 391 | static int intel_gpio_runtime_idle(struct device *dev) | 391 | static int intel_gpio_runtime_idle(struct device *dev) |
| 392 | { | 392 | { |
| 393 | pm_schedule_suspend(dev, 500); | 393 | int err = pm_schedule_suspend(dev, 500); |
| 394 | return -EBUSY; | 394 | return err ?: -EBUSY; |
| 395 | } | 395 | } |
| 396 | 396 | ||
| 397 | static const struct dev_pm_ops intel_gpio_pm_ops = { | 397 | static const struct dev_pm_ops intel_gpio_pm_ops = { |