From 638c477d44e4640dbdbae923151631b0708ee306 Mon Sep 17 00:00:00 2001 From: Libo Chen Date: Wed, 19 Jun 2013 10:05:31 +1000 Subject: [PATCH] drivers/iommu/msm_iommu_dev.c: fix leak and clean up error paths Fix two obvious problems: 1. We have registered msm_iommu_driver first, and need unregister it when registered msm_iommu_ctx_driver fail 2. We don`t need to kfree drvdata before kzalloc successful. Signed-off-by: Libo Chen Acked-by: David Brown Cc: David Woodhouse Cc: James Hogan Signed-off-by: Andrew Morton --- drivers/iommu/msm_iommu_dev.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/msm_iommu_dev.c b/drivers/iommu/msm_iommu_dev.c index 9144a6beed92..63cdeb903d5c 100644 --- a/drivers/iommu/msm_iommu_dev.c +++ b/drivers/iommu/msm_iommu_dev.c @@ -294,22 +294,20 @@ static int msm_iommu_ctx_probe(struct platform_device *pdev) struct msm_iommu_ctx_drvdata *ctx_drvdata = NULL; int i, ret; if (!c || !pdev->dev.parent) { - ret = -EINVAL; - goto fail; + return -EINVAL; } drvdata = dev_get_drvdata(pdev->dev.parent); if (!drvdata) { - ret = -ENODEV; - goto fail; + return -ENODEV; } ctx_drvdata = kzalloc(sizeof(*ctx_drvdata), GFP_KERNEL); if (!ctx_drvdata) { - ret = -ENOMEM; - goto fail; + return -ENOMEM; } + ctx_drvdata->num = c->num; ctx_drvdata->pdev = pdev; @@ -403,6 +401,7 @@ static int __init msm_iommu_driver_init(void) ret = platform_driver_register(&msm_iommu_ctx_driver); if (ret != 0) { + platform_driver_unregister(&msm_iommu_driver); pr_err("Failed to register IOMMU context driver\n"); goto error; } -- 2.39.5