diff options
| author | Mark Brown | 2011-12-29 22:16:59 +0100 |
|---|---|---|
| committer | Mark Brown | 2012-01-20 14:58:24 +0100 |
| commit | 42dad0d84a318d5245b8b311644388dae5f521c0 (patch) | |
| tree | 1f5232e7fd8f7630f6dcf67afcb9c15a576cdf59 /sound/soc/codecs/wm8940.c | |
| parent | ASoC: Make I2C usage unconditional in WM8940 (diff) | |
| download | kernel-qcow2-linux-42dad0d84a318d5245b8b311644388dae5f521c0.tar.gz kernel-qcow2-linux-42dad0d84a318d5245b8b311644388dae5f521c0.tar.xz kernel-qcow2-linux-42dad0d84a318d5245b8b311644388dae5f521c0.zip | |
ASoC: Convert WM8940 to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8940.c')
| -rw-r--r-- | sound/soc/codecs/wm8940.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index ffc123bc943b..ae1933ed3e07 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -749,7 +749,8 @@ static __devinit int wm8940_i2c_probe(struct i2c_client *i2c, struct wm8940_priv *wm8940; int ret; - wm8940 = kzalloc(sizeof(struct wm8940_priv), GFP_KERNEL); + wm8940 = devm_kzalloc(&i2c->dev, sizeof(struct wm8940_priv), + GFP_KERNEL); if (wm8940 == NULL) return -ENOMEM; @@ -758,15 +759,14 @@ static __devinit int wm8940_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm8940, &wm8940_dai, 1); - if (ret < 0) - kfree(wm8940); + return ret; } static __devexit int wm8940_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); - kfree(i2c_get_clientdata(client)); + return 0; } |