diff options
| author |   Felix Blyakher <felixb@sgi.com> | 2009-02-09 09:34:45 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-09 09:34:45 -0600 |
| commit | d41d4113f49e16bfab02eff0248282200be21807 (patch) | |
| tree | ae84803c22a09f138023ef62de73712f324bc62d /drivers/platform/x86/hp-wmi.c | |
| parent | xfs: Update maintainers (diff) | |
| parent | mm: fix error case in mlock downgrade reversion (diff) | |
| download | linux-dev-d41d4113f49e16bfab02eff0248282200be21807.tar.xz linux-dev-d41d4113f49e16bfab02eff0248282200be21807.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/platform/x86/hp-wmi.c')
| -rw-r--r-- | drivers/platform/x86/hp-wmi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index de91ddab0a86..f41135f2fb29 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/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; |