]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
ASoC: Convert wm8978 to devm_kzalloc()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 29 Dec 2011 11:16:53 +0000 (11:16 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 20 Jan 2012 13:58:19 +0000 (13:58 +0000)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8978.c

index 36468f85f3017d5998d27a0c8ef662be5ccc8111..051f5d0d37d6ae31a8529c16c21e2a697f3f2e24 100644 (file)
@@ -997,7 +997,8 @@ static __devinit int wm8978_i2c_probe(struct i2c_client *i2c,
        struct wm8978_priv *wm8978;
        int ret;
 
-       wm8978 = kzalloc(sizeof(struct wm8978_priv), GFP_KERNEL);
+       wm8978 = devm_kzalloc(&i2c->dev, sizeof(struct wm8978_priv),
+                             GFP_KERNEL);
        if (wm8978 == NULL)
                return -ENOMEM;
 
@@ -1005,15 +1006,14 @@ static __devinit int wm8978_i2c_probe(struct i2c_client *i2c,
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8978, &wm8978_dai, 1);
-       if (ret < 0)
-               kfree(wm8978);
+
        return ret;
 }
 
 static __devexit int wm8978_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
+
        return 0;
 }