Skip to content

Commit

Permalink
ASoC: Convert ak4642 to devm_kzalloc()
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Dec 20, 2011
1 parent 4273fcf commit 2ff49ee
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions sound/soc/codecs/ak4642.c
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,8 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c,
struct ak4642_priv *ak4642;
int ret;

ak4642 = kzalloc(sizeof(struct ak4642_priv), GFP_KERNEL);
ak4642 = devm_kzalloc(&i2c->dev, sizeof(struct ak4642_priv),
GFP_KERNEL);
if (!ak4642)
return -ENOMEM;

Expand All @@ -535,15 +536,12 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev,
(struct snd_soc_codec_driver *)id->driver_data,
&ak4642_dai, 1);
if (ret < 0)
kfree(ak4642);
return ret;
}

static __devexit int ak4642_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
kfree(i2c_get_clientdata(client));
return 0;
}

Expand Down

0 comments on commit 2ff49ee

Please sign in to comment.