Skip to content

Commit

Permalink
ASoC: Convert tlv320dac33 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 7fd8a67 commit a54877d
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions sound/soc/codecs/tlv320dac33.c
Original file line number Diff line number Diff line change
Expand Up @@ -1532,7 +1532,8 @@ static int __devinit dac33_i2c_probe(struct i2c_client *client,
}
pdata = client->dev.platform_data;

dac33 = kzalloc(sizeof(struct tlv320dac33_priv), GFP_KERNEL);
dac33 = devm_kzalloc(&client->dev, sizeof(struct tlv320dac33_priv),
GFP_KERNEL);
if (dac33 == NULL)
return -ENOMEM;

Expand Down Expand Up @@ -1587,7 +1588,6 @@ static int __devinit dac33_i2c_probe(struct i2c_client *client,
if (dac33->power_gpio >= 0)
gpio_free(dac33->power_gpio);
err_gpio:
kfree(dac33);
return ret;
}

Expand All @@ -1604,8 +1604,6 @@ static int __devexit dac33_i2c_remove(struct i2c_client *client)
regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies);

snd_soc_unregister_codec(&client->dev);
kfree(dac33);

return 0;
}

Expand Down

0 comments on commit a54877d

Please sign in to comment.