diff options
| author | Anssi Hannula <anssi.hannula@iki.fi> | 2011-02-20 13:07:25 -0500 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:07:19 -0400 |
| commit | 7cd635da42fda9272fd200121e565d116c0c65c9 (patch) | |
| tree | 3f01cf1b6496f3bf9ae712b843bc3bf292d843f8 /drivers/platform | |
| parent | 6d97db590ca2787c202cf35e76f5d24b3007bc7c (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.c | 4 |
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) | |||
| 610 | bluetooth_rfkill = NULL; | 610 | bluetooth_rfkill = NULL; |
| 611 | wwan_rfkill = NULL; | 611 | wwan_rfkill = NULL; |
| 612 | 612 | ||
| 613 | err = hp_wmi_rfkill_setup(device); | 613 | hp_wmi_rfkill_setup(device); |
| 614 | if (err) | ||
| 615 | return err; | ||
| 616 | 614 | ||
| 617 | err = device_create_file(&device->dev, &dev_attr_display); | 615 | err = device_create_file(&device->dev, &dev_attr_display); |
| 618 | if (err) | 616 | if (err) |