From 06571df3af0e90378a4634ac7a1488ed8c892b6b Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 4 Feb 2009 15:12:07 -0800
Subject: [PATCH] --- yaml --- r: 130967 b: refs/heads/master c:
 44f0606d52d98ff05b3b62bb694821857e36819d h: refs/heads/master i:   130965:
 b9bd55f8f16ccb18d2c818f215cce0f71dba628d   130963:
 dfdccd3ee30533636b5b89969351ffcb505962fe   130959:
 3981cd1878a376d81ec530442bcd782425d68cc4 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/platform/x86/hp-wmi.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6a3edb96b2b3..a02974362a87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60fd760fb9ff7034360bab7137c917c0330628c2
+refs/heads/master: 44f0606d52d98ff05b3b62bb694821857e36819d
diff --git a/trunk/drivers/platform/x86/hp-wmi.c b/trunk/drivers/platform/x86/hp-wmi.c
index de91ddab0a86..f41135f2fb29 100644
--- a/trunk/drivers/platform/x86/hp-wmi.c
+++ b/trunk/drivers/platform/x86/hp-wmi.c
@@ -463,9 +463,11 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
 
 	return 0;
 register_wwan_err:
-	rfkill_unregister(bluetooth_rfkill);
+	if (bluetooth_rfkill)
+		rfkill_unregister(bluetooth_rfkill);
 register_bluetooth_error:
-	rfkill_unregister(wifi_rfkill);
+	if (wifi_rfkill)
+		rfkill_unregister(wifi_rfkill);
 add_sysfs_error:
 	cleanup_sysfs(device);
 	return err;