git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
drivers
/
base
/
power
/
clock_ops.c
diff --git
a/drivers/base/power/clock_ops.c
b/drivers/base/power/clock_ops.c
index
eaa8a85
..
ad367c4
100644
(file)
--- a/
drivers/base/power/clock_ops.c
+++ b/
drivers/base/power/clock_ops.c
@@
-387,7
+387,7
@@
static int pm_runtime_clk_notify(struct notifier_block *nb,
clknb = container_of(nb, struct pm_clk_notifier_block, nb);
switch (action) {
clknb = container_of(nb, struct pm_clk_notifier_block, nb);
switch (action) {
- case BUS_NOTIFY_
ADD_DEVICE
:
+ case BUS_NOTIFY_
BIND_DRIVER
:
if (clknb->con_ids[0]) {
for (con_id = clknb->con_ids; *con_id; con_id++)
enable_clock(dev, *con_id);
if (clknb->con_ids[0]) {
for (con_id = clknb->con_ids; *con_id; con_id++)
enable_clock(dev, *con_id);
@@
-395,7
+395,7
@@
static int pm_runtime_clk_notify(struct notifier_block *nb,
enable_clock(dev, NULL);
}
break;
enable_clock(dev, NULL);
}
break;
- case BUS_NOTIFY_
DEL_DEVICE
:
+ case BUS_NOTIFY_
UNBOUND_DRIVER
:
if (clknb->con_ids[0]) {
for (con_id = clknb->con_ids; *con_id; con_id++)
disable_clock(dev, *con_id);
if (clknb->con_ids[0]) {
for (con_id = clknb->con_ids; *con_id; con_id++)
disable_clock(dev, *con_id);