summaryrefslogtreecommitdiff
path: root/drivers/platform
diff options
context:
space:
mode:
authorAnssi Hannula <anssi.hannula@iki.fi>2011-02-20 20:07:25 +0200
committerMatthew Garrett <mjg@redhat.com>2011-03-28 06:07:19 -0400
commit7cd635da42fda9272fd200121e565d116c0c65c9 (patch)
tree3f01cf1b6496f3bf9ae712b843bc3bf292d843f8 /drivers/platform
parent6d97db590ca2787c202cf35e76f5d24b3007bc7c (diff)
hp-wmi: make rfkill initialization failure non-fatal
hp_wmi_rfkill_setup cleans up after itself now, so failing completely is no longer necessary. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/hp-wmi.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 45b2bbe6d835..524ffabc2866 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -610,9 +610,7 @@ static int __devinit hp_wmi_bios_setup(struct platform_device *device)
bluetooth_rfkill = NULL;
wwan_rfkill = NULL;
- err = hp_wmi_rfkill_setup(device);
- if (err)
- return err;
+ hp_wmi_rfkill_setup(device);
err = device_create_file(&device->dev, &dev_attr_display);
if (err)