diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-12 09:28:08 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-12 09:36:50 +0800 |
| commit | 046d4f02e8835ff78f8ba5a09e358b2bc4832903 (patch) | |
| tree | 54f3c4971552c64f248751cf4692e8b488a2e047 /sound/soc/codecs | |
| parent | 587cbbb36ef2657cd888b7705e02cfe96ab088b7 (diff) | |
| download | kernel-common-046d4f02e8835ff78f8ba5a09e358b2bc4832903.tar.gz kernel-common-046d4f02e8835ff78f8ba5a09e358b2bc4832903.tar.bz2 kernel-common-046d4f02e8835ff78f8ba5a09e358b2bc4832903.zip | |
ASoC: wm8991: Convert to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/wm8991.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c index b9dbfebbda13..fe439f027e10 100644 --- a/sound/soc/codecs/wm8991.c +++ b/sound/soc/codecs/wm8991.c @@ -1363,7 +1363,7 @@ static __devinit int wm8991_i2c_probe(struct i2c_client *i2c, struct wm8991_priv *wm8991; int ret; - wm8991 = kzalloc(sizeof *wm8991, GFP_KERNEL); + wm8991 = devm_kzalloc(&i2c->dev, sizeof(*wm8991), GFP_KERNEL); if (!wm8991) return -ENOMEM; @@ -1372,15 +1372,14 @@ static __devinit int wm8991_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm8991, &wm8991_dai, 1); - if (ret < 0) - kfree(wm8991); + return ret; } static __devexit int wm8991_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); - kfree(i2c_get_clientdata(client)); + return 0; } |