diff options
| author | James Morris <jmorris@namei.org> | 2008-12-04 06:16:36 (GMT) |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-04 06:16:36 (GMT) |
| commit | ec98ce480ada787f2cfbd696980ff3564415505b (patch) | |
| tree | 1a4d644b38f9f1e4b4e086fde0b195df4a92cf84 /drivers/acpi/toshiba_acpi.c | |
| parent | 3496f92beb9aa99ef21fccc154a36c7698e9c538 (diff) | |
| parent | feaf3848a813a106f163013af6fcf6c4bfec92d9 (diff) | |
| download | linux-ec98ce480ada787f2cfbd696980ff3564415505b.tar.xz | |
Merge branch 'master' into next
Conflicts:
fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/acpi/toshiba_acpi.c')
| -rw-r--r-- | drivers/acpi/toshiba_acpi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c index 66aac06..25f531d 100644 --- a/drivers/acpi/toshiba_acpi.c +++ b/drivers/acpi/toshiba_acpi.c @@ -848,8 +848,6 @@ static int __init toshiba_acpi_init(void) ret = input_register_polled_device(toshiba_acpi.poll_dev); if (ret) { printk(MY_ERR "unable to register kill-switch input device\n"); - rfkill_free(toshiba_acpi.rfk_dev); - toshiba_acpi.rfk_dev = NULL; toshiba_acpi_exit(); return ret; } |