diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-16 07:42:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-17 10:39:41 +0100 |
| commit | b9791c010966207a9f111e9339d6087a1a7269ab (patch) | |
| tree | 00dc7b962e70c65db6ef601f2e806948875ecd60 /sound/soc/codecs | |
| parent | ASoC: pxa: Convert e800_wm9712 to use snd_soc_register_card() (diff) | |
| download | linux-b9791c010966207a9f111e9339d6087a1a7269ab.tar.xz linux-b9791c010966207a9f111e9339d6087a1a7269ab.zip | |
ASoC: Convert WM8960 to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/wm8960.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 2315b866d002..e5caae32e541 100644 --- a/sound/soc/codecs/wm8960.c +++ b/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; } |