From 1ed4a47f29dbca868af5a3664ad41fe556f5e858 Mon Sep 17 00:00:00 2001
From: Erik Ekman <erik@kryo.se>
Date: Thu, 2 Apr 2009 16:57:08 -0700
Subject: [PATCH] --- yaml --- r: 139639 b: refs/heads/master c:
 8c655918b15691d3a97f4e9a7c3c0a6ac992e297 h: refs/heads/master i:   139637:
 9482f84fdabd1837b8406f29fd7ec7b41e6614de   139635:
 89d350545dc85528eba7cf4d8d4157a1158afc81   139631:
 a60d8f85f0a3461dc694a3d12338ca7a1d072a6d v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/pnp/pnpbios/core.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 65876fe8ec1f..7795fa61f2a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfb9bcdbda9a61bca469bf899a589918c60c4c18
+refs/heads/master: 8c655918b15691d3a97f4e9a7c3c0a6ac992e297
diff --git a/trunk/drivers/pnp/pnpbios/core.c b/trunk/drivers/pnp/pnpbios/core.c
index 996f64838079..e706d22b6dd1 100644
--- a/trunk/drivers/pnp/pnpbios/core.c
+++ b/trunk/drivers/pnp/pnpbios/core.c
@@ -575,8 +575,6 @@ fs_initcall(pnpbios_init);
 
 static int __init pnpbios_thread_init(void)
 {
-	struct task_struct *task;
-
 #if defined(CONFIG_PPC)
 	if (check_legacy_ioport(PNPBIOS_BASE))
 		return 0;
@@ -584,10 +582,13 @@ static int __init pnpbios_thread_init(void)
 	if (pnpbios_disabled)
 		return 0;
 #ifdef CONFIG_HOTPLUG
-	init_completion(&unload_sem);
-	task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");
-	if (!IS_ERR(task))
-		unloading = 0;
+	{
+		struct task_struct *task;
+		init_completion(&unload_sem);
+		task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");
+		if (!IS_ERR(task))
+			unloading = 0;
+	}
 #endif
 	return 0;
 }