Skip to content

Commit

Permalink
ASoC: Convert max9850 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 Jan 2, 2012
1 parent b1b5488 commit bf791bd
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions sound/soc/codecs/max9850.c
Original file line number Diff line number Diff line change
Expand Up @@ -335,23 +335,21 @@ static int __devinit max9850_i2c_probe(struct i2c_client *i2c,
struct max9850_priv *max9850;
int ret;

max9850 = kzalloc(sizeof(struct max9850_priv), GFP_KERNEL);
max9850 = devm_kzalloc(&i2c->dev, sizeof(struct max9850_priv),
GFP_KERNEL);
if (max9850 == NULL)
return -ENOMEM;

i2c_set_clientdata(i2c, max9850);

ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_max9850, &max9850_dai, 1);
if (ret < 0)
kfree(max9850);
return ret;
}

static __devexit int max9850_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 bf791bd

Please sign in to comment.