From e9d4bb14462df9006ecd5c4ca69605d68bbe6c7c Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Thu, 29 Dec 2011 17:51:27 +0100 Subject: [PATCH] --- yaml --- r: 284065 b: refs/heads/master c: 46c3a02cc93083cb946872896428798cfb8609c0 h: refs/heads/master i: 284063: 7204264f530797a2adb86795b535531c92c876b5 v: v3 --- [refs] | 2 +- trunk/sound/soc/au1x/dma.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 8b2bd593ae31..98cabb6ee894 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d8955262ab4cbfcb3ddaca4f978d27d9c088a75 +refs/heads/master: 46c3a02cc93083cb946872896428798cfb8609c0 diff --git a/trunk/sound/soc/au1x/dma.c b/trunk/sound/soc/au1x/dma.c index c4017bd56ab8..0a91b186a86f 100644 --- a/trunk/sound/soc/au1x/dma.c +++ b/trunk/sound/soc/au1x/dma.c @@ -325,27 +325,19 @@ static struct snd_soc_platform_driver alchemy_pcm_soc_platform = { static int __devinit alchemy_pcm_drvprobe(struct platform_device *pdev) { struct alchemy_pcm_ctx *ctx; - int ret; - ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); + ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) return -ENOMEM; platform_set_drvdata(pdev, ctx); - ret = snd_soc_register_platform(&pdev->dev, &alchemy_pcm_soc_platform); - if (ret) - kfree(ctx); - - return ret; + return snd_soc_register_platform(&pdev->dev, &alchemy_pcm_soc_platform); } static int __devexit alchemy_pcm_drvremove(struct platform_device *pdev) { - struct alchemy_pcm_ctx *ctx = platform_get_drvdata(pdev); - snd_soc_unregister_platform(&pdev->dev); - kfree(ctx); return 0; }