From 1d4e9a61864b8320b23ff285fdc46d99db513ef0 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Sat, 26 Dec 2009 21:51:38 -0500
Subject: [PATCH] --- yaml --- r: 178629 b: refs/heads/master c:
 abb631bfe271a9102fb5b05419272b7aec37a974 h: refs/heads/master i:   178627:
 95b0a568e3a0a12afa09a8a341a5d0749ba3d914 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/char/ipmi/ipmi_si_intf.c | 4 ++--
 trunk/drivers/platform/x86/dell-wmi.c  | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 06572c2df67e..8cf2784b65f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27d0567ab635bc2af11be48f91c8d5a7a2dca2e4
+refs/heads/master: abb631bfe271a9102fb5b05419272b7aec37a974
diff --git a/trunk/drivers/char/ipmi/ipmi_si_intf.c b/trunk/drivers/char/ipmi/ipmi_si_intf.c
index 176f1751237f..679cd08b80b4 100644
--- a/trunk/drivers/char/ipmi/ipmi_si_intf.c
+++ b/trunk/drivers/char/ipmi/ipmi_si_intf.c
@@ -3204,7 +3204,7 @@ static __devinit int init_ipmi_si(void)
 #ifdef CONFIG_ACPI
 	spmi_find_bmc();
 #endif
-#ifdef CONFIG_ACPI
+#ifdef CONFIG_PNP
 	pnp_register_driver(&ipmi_pnp_driver);
 #endif
 
@@ -3330,7 +3330,7 @@ static __exit void cleanup_ipmi_si(void)
 #ifdef CONFIG_PCI
 	pci_unregister_driver(&ipmi_pci_driver);
 #endif
-#ifdef CONFIG_ACPI
+#ifdef CONFIG_PNP
 	pnp_unregister_driver(&ipmi_pnp_driver);
 #endif
 
diff --git a/trunk/drivers/platform/x86/dell-wmi.c b/trunk/drivers/platform/x86/dell-wmi.c
index 916ccb2b316c..4c7e70299d6b 100644
--- a/trunk/drivers/platform/x86/dell-wmi.c
+++ b/trunk/drivers/platform/x86/dell-wmi.c
@@ -323,6 +323,7 @@ static int __init dell_wmi_input_setup(void)
 static int __init dell_wmi_init(void)
 {
 	int err;
+	acpi_status status;
 
 	if (wmi_has_guid(DELL_EVENT_GUID)) {
 		printk(KERN_WARNING "dell-wmi: No known WMI GUID found\n");
@@ -336,14 +337,14 @@ static int __init dell_wmi_init(void)
 	if (err)
 		return err;
 
-	err = wmi_install_notify_handler(DELL_EVENT_GUID,
+	status = wmi_install_notify_handler(DELL_EVENT_GUID,
 					 dell_wmi_notify, NULL);
-	if (err) {
+	if (ACPI_FAILURE(status)) {
 		input_unregister_device(dell_wmi_input_dev);
 		printk(KERN_ERR
 			"dell-wmi: Unable to register notify handler - %d\n",
-			err);
-		return err;
+			status);
+		return -ENODEV;
 	}
 
 	return 0;