diff --git a/[refs] b/[refs] index f2d2d02e50df..31d9546cd15a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 971cb7fba0c84dd74c39020f4596b08398f58199 +refs/heads/master: 8cc6b39ff36b4bbce2d7471da088df122b0e9033 diff --git a/trunk/drivers/base/power/main.c b/trunk/drivers/base/power/main.c index a5142bddef41..6ca5cdf63849 100644 --- a/trunk/drivers/base/power/main.c +++ b/trunk/drivers/base/power/main.c @@ -271,8 +271,9 @@ static int pm_noirq_op(struct device *dev, ktime_t calltime, delta, rettime; if (initcall_debug) { - pr_info("calling %s_i+ @ %i\n", - dev_name(dev), task_pid_nr(current)); + pr_info("calling %s+ @ %i, parent: %s\n", + dev_name(dev), task_pid_nr(current), + dev->parent ? dev_name(dev->parent) : "none"); calltime = ktime_get(); }