Duh. Use "device_lock", not "device_root" for locking.

diff --git a/drivers/base/power.c b/drivers/base/power.c
index 68f6ba5ffad2bfeb55fa303cc6535b1fcbf3f109..c2fa3b71a16e2e35c34b18bc0be1e5c6c7d3bee6 100644 (file)
--- a/drivers/base/power.c
+++ b/drivers/base/power.c
@@ -47,7 +47,7 @@ int device_suspend(u32 state, u32 level)
                prev = dev;
                dev = g_list_to_dev(prev->g_list.next);
        }
-       spin_unlock(&device_root);
+       spin_unlock(&device_lock);
        put_device(prev);
 
        return error;
@@ -82,7 +82,7 @@ void device_resume(u32 level)
                prev = dev;
                dev = g_list_to_dev(prev->g_list.prev);
        }
-       spin_unlock(&device_root);
+       spin_unlock(&device_lock);
        put_device(prev);
 
        printk(KERN_EMERG "Devices Resumed\n");
@@ -119,7 +119,7 @@ void device_shutdown(void)
                prev = dev;
                dev = g_list_to_dev(prev->g_list.next);
        }
-       spin_unlock(&device_root);
+       spin_unlock(&device_lock);
        put_device(prev);
 }