Skip to content

Commit

Permalink
ASoC: Convert WM9090 to devm_kzalloc()
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Dec 3, 2011
1 parent 2edaed8 commit 455b91b
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions sound/soc/codecs/wm9090.c
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ static int wm9090_i2c_probe(struct i2c_client *i2c,
struct wm9090_priv *wm9090;
int ret;

wm9090 = kzalloc(sizeof(*wm9090), GFP_KERNEL);
wm9090 = devm_kzalloc(&i2c->dev, sizeof(*wm9090), GFP_KERNEL);
if (wm9090 == NULL) {
dev_err(&i2c->dev, "Can not allocate memory\n");
return -ENOMEM;
Expand All @@ -661,8 +661,6 @@ static int wm9090_i2c_probe(struct i2c_client *i2c,

ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm9090, NULL, 0);
if (ret < 0)
kfree(wm9090);
return ret;
}

Expand All @@ -671,7 +669,6 @@ static int __devexit wm9090_i2c_remove(struct i2c_client *i2c)
struct wm9090_priv *wm9090 = i2c_get_clientdata(i2c);

snd_soc_unregister_codec(&i2c->dev);
kfree(wm9090);

return 0;
}
Expand Down

0 comments on commit 455b91b

Please sign in to comment.