lkml.org 
[lkml]   [2010]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v2 7/12] wm8940: fix a memory leak if wm8940_register return error
    From
    Date
    This patch adds checking for wm8940_register return value,
    and does kfree(wm8940) if wm8940_register() fail.

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    sound/soc/codecs/wm8940.c | 7 ++++++-
    1 files changed, 6 insertions(+), 1 deletions(-)

    diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
    index e3c4bbf..f0c1113 100644
    --- a/sound/soc/codecs/wm8940.c
    +++ b/sound/soc/codecs/wm8940.c
    @@ -845,6 +845,7 @@ static void wm8940_unregister(struct wm8940_priv *wm8940)
    static int wm8940_i2c_probe(struct i2c_client *i2c,
    const struct i2c_device_id *id)
    {
    + int ret;
    struct wm8940_priv *wm8940;
    struct snd_soc_codec *codec;

    @@ -858,7 +859,11 @@ static int wm8940_i2c_probe(struct i2c_client *i2c,
    codec->control_data = i2c;
    codec->dev = &i2c->dev;

    - return wm8940_register(wm8940, SND_SOC_I2C);
    + ret = wm8940_register(wm8940, SND_SOC_I2C);
    + if (ret < 0)
    + kfree(wm8940);
    +
    + return ret;
    }

    static int __devexit wm8940_i2c_remove(struct i2c_client *client)
    --
    1.5.4.3




    \
     
     \ /
      Last update: 2010-07-15 09:51    [W:0.022 / U:0.560 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site