ASoC: Convert wm8961 to devm_kzalloc()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 16 Dec 2011 06:56:02 +0000 (07:56 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 17 Dec 2011 09:39:43 +0000 (09:39 +0000)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8961.c

index 13a0850409008bdb389e3ee6ad619a8730d361e7..8bcc17a613299f6a15cf8e59dde93f85ceaf760a 100644 (file)
@@ -1087,7 +1087,8 @@ static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
        struct wm8961_priv *wm8961;
        int ret;
 
-       wm8961 = kzalloc(sizeof(struct wm8961_priv), GFP_KERNEL);
+       wm8961 = devm_kzalloc(&i2c->dev, sizeof(struct wm8961_priv),
+                             GFP_KERNEL);
        if (wm8961 == NULL)
                return -ENOMEM;
 
@@ -1095,15 +1096,14 @@ static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8961, &wm8961_dai, 1);
-       if (ret < 0)
-               kfree(wm8961);
+
        return ret;
 }
 
 static __devexit int wm8961_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
+
        return 0;
 }