aboutsummaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-01-10 12:01:14 +0800
committerAlex Shi <alex.shi@linaro.org>2017-01-10 12:01:14 +0800
commit7785301d9209cf083369c6f088cd1d48ec417863 (patch)
tree693ad3a1ebdc818a37abebbd8257820604ea8a35 /drivers/misc
parent19192a140ad72b5bd0d57620bfe236bc03561bb6 (diff)
parentf02e043c5ee3014ba0fbae38e699008385c99d7b (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/mei/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 958af84884b5..2ff39fbc70d1 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -698,7 +698,7 @@ void mei_host_client_init(struct work_struct *work)
pm_runtime_mark_last_busy(dev->dev);
dev_dbg(dev->dev, "rpm: autosuspend\n");
- pm_runtime_autosuspend(dev->dev);
+ pm_request_autosuspend(dev->dev);
}
/**