Subject: [folded-merged] drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix.patch removed from -mm tree
To: akpm@xxxxxxxxxxxxxxxxxxxx,clbchenlibo.chen@xxxxxxxxxx,davidb@xxxxxxxxxxxxxx,dwmw2@xxxxxxxxxxxxx,james.hogan@xxxxxxxxxx,libo.chen@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 08 Jul 2013 15:25:42 -0700
The patch titled
Subject: drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix
has been removed from the -mm tree. Its filename was
drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix.patch
This patch was dropped because it was folded into drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix
remove now-unneeded initialization of ctx_drvdata, remove unneeded braces
Cc: David Brown <davidb@xxxxxxxxxxxxxx>
Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: James Hogan <james.hogan@xxxxxxxxxx>
Cc: Libo Chen <clbchenlibo.chen@xxxxxxxxxx>
Cc: Libo Chen <libo.chen@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/iommu/msm_iommu_dev.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff -puN drivers/iommu/msm_iommu_dev.c~drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix drivers/iommu/msm_iommu_dev.c
--- a/drivers/iommu/msm_iommu_dev.c~drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix
+++ a/drivers/iommu/msm_iommu_dev.c
@@ -291,22 +291,19 @@ static int msm_iommu_ctx_probe(struct pl
{
struct msm_iommu_ctx_dev *c = pdev->dev.platform_data;
struct msm_iommu_drvdata *drvdata;
- struct msm_iommu_ctx_drvdata *ctx_drvdata = NULL;
+ struct msm_iommu_ctx_drvdata *ctx_drvdata;
int i, ret;
- if (!c || !pdev->dev.parent) {
+
+ if (!c || !pdev->dev.parent)
return -EINVAL;
- }
drvdata = dev_get_drvdata(pdev->dev.parent);
-
- if (!drvdata) {
+ if (!drvdata)
return -ENODEV;
- }
ctx_drvdata = kzalloc(sizeof(*ctx_drvdata), GFP_KERNEL);
- if (!ctx_drvdata) {
+ if (!ctx_drvdata)
return -ENOMEM;
- }
ctx_drvdata->num = c->num;
ctx_drvdata->pdev = pdev;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths.patch
mm-remove-duplicated-call-of-get_pfn_range_for_nid-v2-fix.patch
memcg-use-css_get-put-when-charging-uncharging-kmem-fix.patch
memcg-use-css_get-put-when-charging-uncharging-kmem-fix-fix-fix.patch
panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix.patch
shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix.patch
ipc-utilc-ipc_rcu_alloc-cacheline-align-allocation-checkpatch-fixes.patch
partitions-add-aix-lvm-partition-support-files-checkpatch-fixes.patch
reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix.patch
reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix-fix.patch
lib-add-lz4-compressor-module-fix.patch
crypto-add-lz4-cryptographic-api-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
