From 76866801aa97f22a17e7cd267fd0d9f72e913549 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Mon, 21 Nov 2011 23:33:55 +0100 Subject: [PATCH] --- yaml --- r: 280355 b: refs/heads/master c: 64e94aafb6a5c4f419e9b8f93950914b5ac162a9 h: refs/heads/master i: 280353: 4879909341d6f057fe0192f7a81fa3488f905f63 280351: 07083be715cefa516723ed3f34d4d964f3571fcd v: v3 --- [refs] | 2 +- trunk/drivers/base/power/main.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index d9189d3409f1..b193b627d687 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d74e278aaf3b0fe4b02af67055aa71babcc0cebe +refs/heads/master: 64e94aafb6a5c4f419e9b8f93950914b5ac162a9 diff --git a/trunk/drivers/base/power/main.c b/trunk/drivers/base/power/main.c index 1172aeaf7ecf..406f82c344fa 100644 --- a/trunk/drivers/base/power/main.c +++ b/trunk/drivers/base/power/main.c @@ -763,31 +763,23 @@ static pm_message_t resume_event(pm_message_t sleep_state) */ static int device_suspend_noirq(struct device *dev, pm_message_t state) { - int error; + int error = 0; if (dev->pm_domain) { pm_dev_dbg(dev, state, "LATE power domain "); error = pm_noirq_op(dev, &dev->pm_domain->ops, state); - if (error) - return error; } else if (dev->type && dev->type->pm) { pm_dev_dbg(dev, state, "LATE type "); error = pm_noirq_op(dev, dev->type->pm, state); - if (error) - return error; } else if (dev->class && dev->class->pm) { pm_dev_dbg(dev, state, "LATE class "); error = pm_noirq_op(dev, dev->class->pm, state); - if (error) - return error; } else if (dev->bus && dev->bus->pm) { pm_dev_dbg(dev, state, "LATE "); error = pm_noirq_op(dev, dev->bus->pm, state); - if (error) - return error; } - return 0; + return error; } /**