]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ASoC: Convert ak4671 to devm_kzalloc()
authorAxel Lin <axel.lin@gmail.com>
Tue, 20 Dec 2011 06:41:19 +0000 (14:41 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Dec 2011 10:13:58 +0000 (10:13 +0000)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/ak4671.c

index 4f5c69f735a94a35bd560e2292035142e6458ab4..a53b152e6a07a529fc4e1298fc33bc4ccb3abdb2 100644 (file)
@@ -661,7 +661,8 @@ static int __devinit ak4671_i2c_probe(struct i2c_client *client,
        struct ak4671_priv *ak4671;
        int ret;
 
-       ak4671 = kzalloc(sizeof(struct ak4671_priv), GFP_KERNEL);
+       ak4671 = devm_kzalloc(&client->dev, sizeof(struct ak4671_priv),
+                             GFP_KERNEL);
        if (ak4671 == NULL)
                return -ENOMEM;
 
@@ -670,15 +671,12 @@ static int __devinit ak4671_i2c_probe(struct i2c_client *client,
 
        ret = snd_soc_register_codec(&client->dev,
                        &soc_codec_dev_ak4671, &ak4671_dai, 1);
-       if (ret < 0)
-               kfree(ak4671);
        return ret;
 }
 
 static __devexit int ak4671_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }