Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / sound / soc / codecs / max98095.c

diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index c69dd022bea887335e55818e921926864f4e4fd9..fcfa7497d7b74aac4777def9e7b7d186ec7c58ef 100644 (file)
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -2340,7 +2340,8 @@ static int max98095_i2c_probe(struct i2c_client *i2c,
        struct max98095_priv *max98095;
        int ret;
 
-       max98095 = kzalloc(sizeof(struct max98095_priv), GFP_KERNEL);
+       max98095 = devm_kzalloc(&i2c->dev, sizeof(struct max98095_priv),
+                               GFP_KERNEL);
        if (max98095 == NULL)
                return -ENOMEM;
 
@@ -2350,16 +2351,12 @@ static int max98095_i2c_probe(struct i2c_client *i2c,
 
        ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_max98095,
                                     max98095_dai, ARRAY_SIZE(max98095_dai));
-       if (ret < 0)
-               kfree(max98095);
        return ret;
 }
 
 static int __devexit max98095_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
-
        return 0;
 }