This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / base / power / resume.c

diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index f8f5055..1d830be 100644 (file)
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -31,22 +31,16 @@ int resume_device(struct device * dev)
 
 void dpm_resume(void)
 {
-       down(&dpm_list_sem);
        while(!list_empty(&dpm_off)) {
                struct list_head * entry = dpm_off.next;
                struct device * dev = to_device(entry);
-
-               get_device(dev);
                list_del_init(entry);
-               list_add_tail(entry, &dpm_active);
 
-               up(&dpm_list_sem);
                if (!dev->power.prev_state)
                        resume_device(dev);
-               down(&dpm_list_sem);
-               put_device(dev);
+
+               list_add_tail(entry, &dpm_active);
        }
-       up(&dpm_list_sem);
 }
 
 
@@ -64,7 +58,7 @@ void device_resume(void)
        up(&dpm_sem);
 }
 
-EXPORT_SYMBOL_GPL(device_resume);
+EXPORT_SYMBOL(device_resume);
 
 
 /**
@@ -82,13 +76,9 @@ void dpm_power_up(void)
 {
        while(!list_empty(&dpm_off_irq)) {
                struct list_head * entry = dpm_off_irq.next;
-               struct device * dev = to_device(entry);
-
-               get_device(dev);
                list_del_init(entry);
+               resume_device(to_device(entry));
                list_add_tail(entry, &dpm_active);
-               resume_device(dev);
-               put_device(dev);
        }
 }
 
@@ -107,6 +97,6 @@ void device_power_up(void)
        dpm_power_up();
 }
 
-EXPORT_SYMBOL_GPL(device_power_up);
+EXPORT_SYMBOL(device_power_up);