summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2009-01-29 14:25:14 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-29 18:04:44 -0800
commit6989d5651a16b49908069b514329d5114217ea0e (patch)
treea263480086af794d38ac995b54be21a6b4a8e6ff /drivers/platform
parent8d50d369d1b3ccc4d96ce01f62146173ee7064ca (diff)
downloadlinux-6989d5651a16b49908069b514329d5114217ea0e.tar.gz
linux-6989d5651a16b49908069b514329d5114217ea0e.tar.bz2
linux-6989d5651a16b49908069b514329d5114217ea0e.zip
hp-wmi: fix regressions caused by missing if statement
Error was introduced in commit fe8e4e039dc3 ("hp-wmi: handle rfkill_register() failure"). Signed-off-by: Frans Pop <elendil@planet.nl> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Acked-by: Matthew Garrett <mjg@redhat.com> Cc: Matthew Garrett <mjg59@srcf.ucam.org> Cc: Len Brown <lenb@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/hp-wmi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 7c789f0a94d7..626042066be4 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -441,6 +441,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set;
bluetooth_rfkill->user_claim_unsupported = 1;
err = rfkill_register(bluetooth_rfkill);
+ if (err)
goto register_bluetooth_error;
}