From 2af054c96b85f3f2f230b50cd412e4e96421d5a0 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 16 Dec 2011 07:42:58 +0100 Subject: [PATCH] --- yaml --- r: 283971 b: refs/heads/master c: b9791c010966207a9f111e9339d6087a1a7269ab h: refs/heads/master i: 283969: 23bc328070224ca455324e1df563615c9a8b26f7 283967: d8ff424a27e0f01221e9ed68a34aa287e5dd4f54 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8960.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 03a37fcf75e8..77a46307698a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1eb0202dc7e45be5996416bc41489ae5a75485e5 +refs/heads/master: b9791c010966207a9f111e9339d6087a1a7269ab diff --git a/trunk/sound/soc/codecs/wm8960.c b/trunk/sound/soc/codecs/wm8960.c index 2315b866d002..e5caae32e541 100644 --- a/trunk/sound/soc/codecs/wm8960.c +++ b/trunk/sound/soc/codecs/wm8960.c @@ -973,7 +973,8 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, struct wm8960_priv *wm8960; int ret; - wm8960 = kzalloc(sizeof(struct wm8960_priv), GFP_KERNEL); + wm8960 = devm_kzalloc(&i2c->dev, sizeof(struct wm8960_priv), + GFP_KERNEL); if (wm8960 == NULL) return -ENOMEM; @@ -982,15 +983,13 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm8960, &wm8960_dai, 1); - if (ret < 0) - kfree(wm8960); + return ret; } static __devexit int wm8960_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); - kfree(i2c_get_clientdata(client)); return 0; }