diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-26 13:48:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-27 13:58:02 +0100 |
| commit | 6ab7e71a9cbcd31f5ee09da384bcfcf0fa11b8c9 (patch) | |
| tree | 3c3d1d9ffea7334bff2dfd039ab3f5333837b309 /sound/soc/codecs/88pm860x-codec.c | |
| parent | ASoC: Convert uda1380 to devm_kzalloc() (diff) | |
| download | linux-6ab7e71a9cbcd31f5ee09da384bcfcf0fa11b8c9.tar.xz linux-6ab7e71a9cbcd31f5ee09da384bcfcf0fa11b8c9.zip | |
ASoC: Convert 88pm860x-codec to devm_kzalloc()
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to '')
| -rw-r--r-- | sound/soc/codecs/88pm860x-codec.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 99ca53c01676..9fd3b6827bba 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c @@ -1430,7 +1430,8 @@ static int __devinit pm860x_codec_probe(struct platform_device *pdev) struct resource *res; int i, ret; - pm860x = kzalloc(sizeof(struct pm860x_priv), GFP_KERNEL); + pm860x = devm_kzalloc(&pdev->dev, sizeof(struct pm860x_priv), + GFP_KERNEL); if (pm860x == NULL) return -ENOMEM; @@ -1459,17 +1460,13 @@ static int __devinit pm860x_codec_probe(struct platform_device *pdev) out: platform_set_drvdata(pdev, NULL); - kfree(pm860x); return -EINVAL; } static int __devexit pm860x_codec_remove(struct platform_device *pdev) { - struct pm860x_priv *pm860x = platform_get_drvdata(pdev); - snd_soc_unregister_codec(&pdev->dev); platform_set_drvdata(pdev, NULL); - kfree(pm860x); return 0; } |