diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-12 09:25:59 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-12 09:36:44 +0800 |
| commit | 398c02f6c213c5d0a791ebf9517b6e7029dc5cf0 (patch) | |
| tree | 916b2902bc857b48d529672a793e1e8fe6adfe66 | |
| parent | 3217b0f5b6fd91440fd72cf24a8986b3f99d0d84 (diff) | |
| download | op-kernel-dev-398c02f6c213c5d0a791ebf9517b6e7029dc5cf0.zip op-kernel-dev-398c02f6c213c5d0a791ebf9517b6e7029dc5cf0.tar.gz | |
ASoC: wm8580: Convert to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/codecs/wm8580.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 7c68226..cc198df 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c @@ -899,7 +899,8 @@ static int wm8580_i2c_probe(struct i2c_client *i2c, struct wm8580_priv *wm8580; int ret; - wm8580 = kzalloc(sizeof(struct wm8580_priv), GFP_KERNEL); + wm8580 = devm_kzalloc(&i2c->dev, sizeof(struct wm8580_priv), + GFP_KERNEL); if (wm8580 == NULL) return -ENOMEM; @@ -908,15 +909,13 @@ static int wm8580_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm8580, wm8580_dai, ARRAY_SIZE(wm8580_dai)); - if (ret < 0) - kfree(wm8580); + return ret; } static int wm8580_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); - kfree(i2c_get_clientdata(client)); return 0; } |
