Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 284066
b: refs/heads/master
c: be547dd
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and Mark Brown committed Jan 2, 2012
1 parent e9d4bb1 commit a5b0540
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 46c3a02cc93083cb946872896428798cfb8609c0
refs/heads/master: be547dd1727fce22ec001006ea4da169df32b6c6
14 changes: 4 additions & 10 deletions trunk/sound/soc/au1x/dbdma2.c
Original file line number Diff line number Diff line change
Expand Up @@ -350,27 +350,21 @@ static struct snd_soc_platform_driver au1xpsc_soc_platform = {
static int __devinit au1xpsc_pcm_drvprobe(struct platform_device *pdev)
{
struct au1xpsc_audio_dmadata *dmadata;
int ret;

dmadata = kzalloc(2 * sizeof(struct au1xpsc_audio_dmadata), GFP_KERNEL);
dmadata = devm_kzalloc(&pdev->dev,
2 * sizeof(struct au1xpsc_audio_dmadata),
GFP_KERNEL);
if (!dmadata)
return -ENOMEM;

platform_set_drvdata(pdev, dmadata);

ret = snd_soc_register_platform(&pdev->dev, &au1xpsc_soc_platform);
if (ret)
kfree(dmadata);

return ret;
return snd_soc_register_platform(&pdev->dev, &au1xpsc_soc_platform);
}

static int __devexit au1xpsc_pcm_drvremove(struct platform_device *pdev)
{
struct au1xpsc_audio_dmadata *dmadata = platform_get_drvdata(pdev);

snd_soc_unregister_platform(&pdev->dev);
kfree(dmadata);

return 0;
}
Expand Down

0 comments on commit a5b0540

Please sign in to comment.