diff options
| author | Ike Panhc <ike.pan@canonical.com> | 2010-10-01 09:40:22 +0200 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-10-21 15:36:51 +0200 |
| commit | bfa97b7dab708b100040a1335ea0860a8b9ef346 (patch) | |
| tree | 372a9f0ebef5b12579f30367128915d7b72487fa /drivers/platform/x86 | |
| parent | ideapad: Change the driver name to ideapad-laptop (diff) | |
| download | linux-bfa97b7dab708b100040a1335ea0860a8b9ef346.tar.xz linux-bfa97b7dab708b100040a1335ea0860a8b9ef346.zip | |
ideapad: Add param: no_bt_rfkill
Add new module parameter that force module not to register bluetooth rfkill.
There is report that saying using this bluetooth rfkill to enable/disable
bluetooth will let bluetooth device initial failed when enable on Lenovo
ideapad S12. Fortunately there is another rfkill registered by bluetooth
driver for S12 and user can shutdown the bluetooth by either bluetooth driver
or HW RF switch.
For dual OS user, it may have some trouble that using Linux after turning off
bluetooth with another OS if we do not register bluetooth rfkill at all. So
we will force bluetooth enable when no_bt_rfkill=1.
Signed-off-by: Ike Panhc <ike.pan@canonical.com>
Tested-by: Mario 'BitKoenig' Holbe <Mario.Holbe@TU-Ilmenau.DE>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform/x86')
| -rw-r--r-- | drivers/platform/x86/ideapad-laptop.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c index e9f7395efc3a..5ff12205aa6b 100644 --- a/drivers/platform/x86/ideapad-laptop.c +++ b/drivers/platform/x86/ideapad-laptop.c @@ -52,6 +52,10 @@ static struct { { "ideapad_killsw", 0, 0, RFKILL_TYPE_WLAN } }; +static bool no_bt_rfkill; +module_param(no_bt_rfkill, bool, 0444); +MODULE_PARM_DESC(no_bt_rfkill, "No rfkill for bluetooth."); + /* * ACPI Helpers */ @@ -232,6 +236,14 @@ static int ideapad_register_rfkill(struct acpi_device *adevice, int dev) int ret; unsigned long sw_blocked; + if (no_bt_rfkill && + (ideapad_rfk_data[dev].type == RFKILL_TYPE_BLUETOOTH)) { + /* Force to enable bluetooth when no_bt_rfkill=1 */ + write_ec_cmd(ideapad_priv->handle, + ideapad_rfk_data[dev].opcode, 1); + return 0; + } + priv->rfk[dev] = rfkill_alloc(ideapad_rfk_data[dev].name, &adevice->dev, ideapad_rfk_data[dev].type, &ideapad_rfk_ops, (void *)(long)dev); |