summaryrefslogtreecommitdiffstats
path: root/drivers/base/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-08 01:11:49 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-08 01:11:49 +0100
commitc4e4d631feb3be4ddf885e647127fddebb450334 (patch)
tree72b38ba229ab010d131f583ef67cb792a23f0280 /drivers/base/power
parent4295733eee4e69eda432d95765b7762dc6013271 (diff)
parentd35818a9153e7f230fd65dc935e001a1b9bc08ff (diff)
downloadlinux-c4e4d631feb3be4ddf885e647127fddebb450334.tar.bz2
Merge branch 'acpi-soc' into pm-core
Diffstat (limited to 'drivers/base/power')
-rw-r--r--drivers/base/power/clock_ops.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index 60ee5591ee8f..c39b8617280f 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -473,6 +473,7 @@ static int pm_clk_notify(struct notifier_block *nb,
enable_clock(dev, NULL);
}
break;
+ case BUS_NOTIFY_DRIVER_NOT_BOUND:
case BUS_NOTIFY_UNBOUND_DRIVER:
if (clknb->con_ids[0]) {
for (con_id = clknb->con_ids; *con_id; con_id++)