aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/dma-contiguous.c2
-rw-r--r--drivers/base/power/main.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index 99802d6f3c60..165c2c299e57 100644
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -49,7 +49,7 @@ struct cma *dma_contiguous_default_area;
49 49
50/* 50/*
51 * Default global CMA area size can be defined in kernel's .config. 51 * Default global CMA area size can be defined in kernel's .config.
52 * This is usefull mainly for distro maintainers to create a kernel 52 * This is useful mainly for distro maintainers to create a kernel
53 * that works correctly for most supported systems. 53 * that works correctly for most supported systems.
54 * The size can be set in bytes or as a percentage of the total memory 54 * The size can be set in bytes or as a percentage of the total memory
55 * in the system. 55 * in the system.
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 2a1b06ae0bdc..1b41fca3d65a 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -757,7 +757,7 @@ void dpm_resume(pm_message_t state)
757 async_error = 0; 757 async_error = 0;
758 758
759 list_for_each_entry(dev, &dpm_suspended_list, power.entry) { 759 list_for_each_entry(dev, &dpm_suspended_list, power.entry) {
760 INIT_COMPLETION(dev->power.completion); 760 reinit_completion(&dev->power.completion);
761 if (is_async(dev)) { 761 if (is_async(dev)) {
762 get_device(dev); 762 get_device(dev);
763 async_schedule(async_resume, dev); 763 async_schedule(async_resume, dev);
@@ -1237,7 +1237,7 @@ static void async_suspend(void *data, async_cookie_t cookie)
1237 1237
1238static int device_suspend(struct device *dev) 1238static int device_suspend(struct device *dev)
1239{ 1239{
1240 INIT_COMPLETION(dev->power.completion); 1240 reinit_completion(&dev->power.completion);
1241 1241
1242 if (pm_async_enabled && dev->power.async_suspend) { 1242 if (pm_async_enabled && dev->power.async_suspend) {
1243 get_device(dev); 1243 get_device(dev);