Merge tag 'v3.14-rc6' into devel

Linux 3.14-rc6
This commit is contained in:
Linus Walleij
2014-03-14 10:26:45 +01:00
1429 changed files with 17464 additions and 9013 deletions

View File

@@ -390,8 +390,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 = {