---

yaml --- r: 243073 b: refs/heads/master c: c14d4b8 h: refs/heads/master i: 243071: f66158c v: v3
git-mirror · Mar 28, 2011 · 0fdc446 · 0fdc446
1 parent 6db4da8
commit 0fdc446
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b71872650fe967eb0a38aa0d7dcbe9c60d160032
+refs/heads/master: c14d4b8ea799515cd44134b8eddd8f789f0b6286
diff --git a/trunk/drivers/platform/x86/eeepc-wmi.c b/trunk/drivers/platform/x86/eeepc-wmi.c
@@ -748,6 +748,9 @@ static int eeepc_wmi_rfkill_init(struct eeepc_wmi *eeepc)
 	if (result && result != -ENODEV)
 		goto exit;
 
+	if (!eeepc->hotplug_wireless)
+		goto exit;
+
 	result = eeepc_setup_pci_hotplug(eeepc);
 	/*
 	 * If we get -EBUSY then something else is handling the PCI hotplug -