evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shdma: fix initialization error handling

Browse source 
1/ Error handling code following a kzalloc should free the allocated data.
2/ Report an error when no platform data is detected

Both problems fixed by moving the platform data check before the allocation,
and allows a goto to be killed.

Reported-by: Julia Lawall <julia@diku.dk>
Acked-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2009-11-22 12:10:10 -07:00
parent 49954c1567
commit 56adf7e812
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/dma/shdma.c
View file

@ -640,17 +640,16 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
#endif #endif
struct sh_dmae_device *shdev; struct sh_dmae_device *shdev;
/* get platform data */
if (!pdev->dev.platform_data)
return -ENODEV;
shdev = kzalloc(sizeof(struct sh_dmae_device), GFP_KERNEL); shdev = kzalloc(sizeof(struct sh_dmae_device), GFP_KERNEL);
if (!shdev) { if (!shdev) {
dev_err(&pdev->dev, "No enough memory\n"); dev_err(&pdev->dev, "No enough memory\n");
err = -ENOMEM; return -ENOMEM;
goto shdev_err;
} }
/* get platform data */
if (!pdev->dev.platform_data)
goto shdev_err;
/* platform data */ /* platform data */
memcpy(&shdev->pdata, pdev->dev.platform_data, memcpy(&shdev->pdata, pdev->dev.platform_data,
sizeof(struct sh_dmae_pdata)); sizeof(struct sh_dmae_pdata));
@ -722,7 +721,6 @@ eirq_err:
rst_err: rst_err:
kfree(shdev); kfree(shdev);
shdev_err:
return err; return err;
} }