diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-12-23 01:21:47 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-12-23 01:21:47 +0100 |
| commit | f80ca163d65903276bec7045a484a79c0897eb2d (patch) | |
| tree | 97c7d61d43248b9db0757a76af80ff58b98b5599 /drivers/dma/shdma.c | |
| parent | drivers/dma: Correct use after free (diff) | |
| parent | ioat2,3: put channel hardware in known state at init (diff) | |
| download | linux-f80ca163d65903276bec7045a484a79c0897eb2d.tar.xz linux-f80ca163d65903276bec7045a484a79c0897eb2d.zip | |
Merge branch 'ioat' into fixes
Diffstat (limited to 'drivers/dma/shdma.c')
| -rw-r--r-- | drivers/dma/shdma.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index 9546f5f356eb..d10cc899c460 100644 --- a/drivers/dma/shdma.c +++ b/drivers/dma/shdma.c @@ -730,17 +730,16 @@ static int __init sh_dmae_probe(struct platform_device *pdev) #endif struct sh_dmae_device *shdev; + /* get platform data */ + if (!pdev->dev.platform_data) + return -ENODEV; + shdev = kzalloc(sizeof(struct sh_dmae_device), GFP_KERNEL); if (!shdev) { dev_err(&pdev->dev, "No enough memory\n"); - err = -ENOMEM; - goto shdev_err; + return -ENOMEM; } - /* get platform data */ - if (!pdev->dev.platform_data) - goto shdev_err; - /* platform data */ memcpy(&shdev->pdata, pdev->dev.platform_data, sizeof(struct sh_dmae_pdata)); @@ -814,7 +813,6 @@ eirq_err: rst_err: kfree(shdev); -shdev_err: return err; } |