diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-02-24 22:21:29 -0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-24 22:21:29 -0800 |
| commit | 10b7cdc0084c27a312e59e80420c6aac70c64753 (patch) | |
| tree | ee891d6236bcd8dc988624839760aaa1846cf906 /sound/soc/txx9/txx9aclc-ac97.c | |
| parent | 00efcb1c8e1c3c5e5d3ce6f0682d66402911a84f (diff) | |
| parent | 60480994c70981d0336aadb3f46b052977d3d19f (diff) | |
Merge branch 'clocks/fixes/drivers' of git://linuxtv.org/pinchartl/fbdev into clk-fixes
Diffstat (limited to 'sound/soc/txx9/txx9aclc-ac97.c')
| -rw-r--r-- | sound/soc/txx9/txx9aclc-ac97.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c index e0305a14856..9edd68db9f4 100644 --- a/sound/soc/txx9/txx9aclc-ac97.c +++ b/sound/soc/txx9/txx9aclc-ac97.c @@ -183,14 +183,16 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq < 0) return irq; + + drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) + return -ENOMEM; + r = platform_get_resource(pdev, IORESOURCE_MEM, 0); drvdata->base = devm_ioremap_resource(&pdev->dev, r); if (IS_ERR(drvdata->base)) return PTR_ERR(drvdata->base); - drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); - if (!drvdata) - return -ENOMEM; platform_set_drvdata(pdev, drvdata); drvdata->physbase = r->start; if (sizeof(drvdata->physbase) > sizeof(r->start) && |