diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-24 10:46:24 +0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-24 08:44:47 +0200 |
| commit | 3482e664dc7f44e0ffb1fcf1de7af74977748f31 (patch) | |
| tree | 75a1453f240ffc5eb9b96ee583ff82e4e36e8ce9 /arch/x86/platform/olpc | |
| parent | ad0304cfd90f46bfcae3a6cd2b69067741541730 (diff) | |
| download | op-kernel-dev-3482e664dc7f44e0ffb1fcf1de7af74977748f31.zip op-kernel-dev-3482e664dc7f44e0ffb1fcf1de7af74977748f31.tar.gz | |
x86/olpc/xo1/sci: Don't call input_free_device() after input_unregister_device()
input_free_device() should only be used if
input_register_device() was not called yet or if it failed. Once
device was unregistered use input_unregister_device() and memory
will be freed once last reference to the device is dropped.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Cc: dsd@laptop.org
Cc: pgf@laptop.org
Cc: gregkh@linuxfoundation.org
Link: http://lkml.kernel.org/r/CAPgLHd84cboeucog%2BYNdHvGqTfTROujDKZgSkh3o0B-Q93ee2A@mail.gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/platform/olpc')
| -rw-r--r-- | arch/x86/platform/olpc/olpc-xo1-sci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/platform/olpc/olpc-xo1-sci.c b/arch/x86/platform/olpc/olpc-xo1-sci.c index 74704be..9a2e590 100644 --- a/arch/x86/platform/olpc/olpc-xo1-sci.c +++ b/arch/x86/platform/olpc/olpc-xo1-sci.c @@ -460,7 +460,6 @@ static int setup_power_button(struct platform_device *pdev) static void free_power_button(void) { input_unregister_device(power_button_idev); - input_free_device(power_button_idev); } static int setup_ebook_switch(struct platform_device *pdev) @@ -491,7 +490,6 @@ static int setup_ebook_switch(struct platform_device *pdev) static void free_ebook_switch(void) { input_unregister_device(ebook_switch_idev); - input_free_device(ebook_switch_idev); } static int setup_lid_switch(struct platform_device *pdev) @@ -526,6 +524,7 @@ static int setup_lid_switch(struct platform_device *pdev) err_create_attr: input_unregister_device(lid_switch_idev); + lid_switch_idev = NULL; err_register: input_free_device(lid_switch_idev); return r; @@ -535,7 +534,6 @@ static void free_lid_switch(void) { device_remove_file(&lid_switch_idev->dev, &dev_attr_lid_wake_mode); input_unregister_device(lid_switch_idev); - input_free_device(lid_switch_idev); } static int xo1_sci_probe(struct platform_device *pdev) |
