Skip to content

Commit

Permalink
ASoC: Convert wm8770 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 9, 2011
1 parent 7fcadfd commit 3025ae4
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions sound/soc/codecs/wm8770.c
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,8 @@ static int __devinit wm8770_spi_probe(struct spi_device *spi)
struct wm8770_priv *wm8770;
int ret;

wm8770 = kzalloc(sizeof(struct wm8770_priv), GFP_KERNEL);
wm8770 = devm_kzalloc(&spi->dev, sizeof(struct wm8770_priv),
GFP_KERNEL);
if (!wm8770)
return -ENOMEM;

Expand All @@ -704,15 +705,13 @@ static int __devinit wm8770_spi_probe(struct spi_device *spi)

ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_wm8770, &wm8770_dai, 1);
if (ret < 0)
kfree(wm8770);

return ret;
}

static int __devexit wm8770_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
kfree(spi_get_drvdata(spi));
return 0;
}

Expand Down

0 comments on commit 3025ae4

Please sign in to comment.