From 005beabb717de05769775cd37406d88f8666ce28 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Sun, 13 Dec 2009 20:31:12 +0100 Subject: [PATCH] --- yaml --- r: 177378 b: refs/heads/master c: 33c3374031facf7599c30a1548dfa4c83da87da3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/power/main.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index d8573559edbd..d62971308637 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2511774863487e61b56a97da07ebf8dd61d7836 +refs/heads/master: 33c3374031facf7599c30a1548dfa4c83da87da3 diff --git a/trunk/drivers/base/power/main.c b/trunk/drivers/base/power/main.c index 30f0ceebd36c..df04cb4a3611 100644 --- a/trunk/drivers/base/power/main.c +++ b/trunk/drivers/base/power/main.c @@ -372,14 +372,11 @@ static int device_resume_noirq(struct device *dev, pm_message_t state) TRACE_DEVICE(dev); TRACE_RESUME(0); - if (!dev->bus) - goto End; - - if (dev->bus->pm) { + if (dev->bus && dev->bus->pm) { pm_dev_dbg(dev, state, "EARLY "); error = pm_noirq_op(dev, dev->bus->pm, state); } - End: + TRACE_RESUME(error); return error; } @@ -615,10 +612,7 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state) { int error = 0; - if (!dev->bus) - return 0; - - if (dev->bus->pm) { + if (dev->bus && dev->bus->pm) { pm_dev_dbg(dev, state, "LATE "); error = pm_noirq_op(dev, dev->bus->pm, state); }