ASoC: wm8990: Convert to devm_kzalloc()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 12 Sep 2012 01:26:53 +0000 (09:26 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 12 Sep 2012 01:36:49 +0000 (09:36 +0800)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8990.c

index db63c97ddf5160afe74c8b2bcd9f9f1d28c27273..c28c83e5395d93d76288bebd356df1abdf791f49 100644 (file)
@@ -1388,7 +1388,8 @@ static __devinit int wm8990_i2c_probe(struct i2c_client *i2c,
        struct wm8990_priv *wm8990;
        int ret;
 
-       wm8990 = kzalloc(sizeof(struct wm8990_priv), GFP_KERNEL);
+       wm8990 = devm_kzalloc(&i2c->dev, sizeof(struct wm8990_priv),
+                             GFP_KERNEL);
        if (wm8990 == NULL)
                return -ENOMEM;
 
@@ -1396,15 +1397,14 @@ static __devinit int wm8990_i2c_probe(struct i2c_client *i2c,
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8990, &wm8990_dai, 1);
-       if (ret < 0)
-               kfree(wm8990);
+
        return ret;
 }
 
 static __devexit int wm8990_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
+
        return 0;
 }