]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ASoC: Convert da7210 to devm_kzalloc()
authorAxel Lin <axel.lin@gmail.com>
Mon, 26 Dec 2011 12:54:04 +0000 (20:54 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 27 Dec 2011 12:58:02 +0000 (12:58 +0000)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/da7210.c

index e4ca61c18605027362f390466368cfced743befc..62e6a9cc82bdc82d95d2bdd6f3a42f96ad6a77fa 100644 (file)
@@ -944,7 +944,8 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c,
        struct da7210_priv *da7210;
        int ret;
 
-       da7210 = kzalloc(sizeof(struct da7210_priv), GFP_KERNEL);
+       da7210 = devm_kzalloc(&i2c->dev, sizeof(struct da7210_priv),
+                             GFP_KERNEL);
        if (!da7210)
                return -ENOMEM;
 
@@ -953,16 +954,12 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c,
 
        ret =  snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_da7210, &da7210_dai, 1);
-       if (ret < 0)
-               kfree(da7210);
-
        return ret;
 }
 
 static int __devexit da7210_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }