lkml.org 
[lkml]   [2009]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/5] dell-laptop: fix rfkill memory leak on unload and failure paths
    Date
    rfkill_unregister() should always be followed by rfkill_destroy().

    Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
    ---
    drivers/platform/x86/dell-laptop.c | 30 ++++++++++++++++++------------
    1 files changed, 18 insertions(+), 12 deletions(-)

    diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
    index 12b6f33..8fbff38 100644
    --- a/drivers/platform/x86/dell-laptop.c
    +++ b/drivers/platform/x86/dell-laptop.c
    @@ -268,6 +268,22 @@ err_wifi:
    return ret;
    }

    +static void dell_cleanup_rfkill(void)
    +{
    + if (wifi_rfkill) {
    + rfkill_unregister(wifi_rfkill);
    + rfkill_destroy(wifi_rfkill);
    + }
    + if (bluetooth_rfkill) {
    + rfkill_unregister(bluetooth_rfkill);
    + rfkill_destroy(bluetooth_rfkill);
    + }
    + if (wwan_rfkill) {
    + rfkill_unregister(wwan_rfkill);
    + rfkill_destroy(wwan_rfkill);
    + }
    +}
    +
    static int dell_send_intensity(struct backlight_device *bd)
    {
    struct calling_interface_buffer buffer;
    @@ -370,12 +386,7 @@ static int __init dell_init(void)
    return 0;

    fail_backlight:
    - if (wifi_rfkill)
    - rfkill_unregister(wifi_rfkill);
    - if (bluetooth_rfkill)
    - rfkill_unregister(bluetooth_rfkill);
    - if (wwan_rfkill)
    - rfkill_unregister(wwan_rfkill);
    + dell_cleanup_rfkill();
    fail_rfkill:
    kfree(da_tokens);
    return ret;
    @@ -384,12 +395,7 @@ fail_rfkill:
    static void __exit dell_exit(void)
    {
    backlight_device_unregister(dell_backlight_device);
    - if (wifi_rfkill)
    - rfkill_unregister(wifi_rfkill);
    - if (bluetooth_rfkill)
    - rfkill_unregister(bluetooth_rfkill);
    - if (wwan_rfkill)
    - rfkill_unregister(wwan_rfkill);
    + dell_cleanup_rfkill();
    }

    module_init(dell_init);
    --
    1.6.3.2


    \
     
     \ /
      Last update: 2009-08-19 16:19    [W:0.040 / U:210.984 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site