From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: linux-kernel@vger.kernel.org
Cc: jcliang@chromium.org, robin.murphy@arm.com, tfiga@chromium.org,
Jeffy Chen <jeffy.chen@rock-chips.com>,
Heiko Stuebner <heiko@sntech.de>,
linux-rockchip@lists.infradead.org,
iommu@lists.linux-foundation.org, Joerg Roedel <joro@8bytes.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/9] iommu/rockchip: Fix error handling in probe
Date: Thu, 11 Jan 2018 16:22:23 +0800 [thread overview]
Message-ID: <20180111082229.24011-4-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <20180111082229.24011-1-jeffy.chen@rock-chips.com>
Add missing iommu_device_sysfs_remove in error path.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
drivers/iommu/rockchip-iommu.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index ee805e1dfba7..a05844cabb45 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1201,8 +1201,12 @@ static int rk_iommu_probe(struct platform_device *pdev)
iommu_device_set_ops(&iommu->iommu, &rk_iommu_ops);
err = iommu_device_register(&iommu->iommu);
+ if (err) {
+ iommu_device_sysfs_remove(&iommu->iommu);
+ return err;
+ }
- return err;
+ return 0;
}
static int rk_iommu_remove(struct platform_device *pdev)
--
2.11.0
next prev parent reply other threads:[~2018-01-11 8:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-11 8:22 [PATCH 0/9] iommu/rockchip: Use OF_IOMMU Jeffy Chen
2018-01-11 8:22 ` [PATCH 1/9] iommu/of: Drop early initialisation hooks Jeffy Chen
2018-01-11 9:40 ` Marek Szyprowski
2018-01-11 11:14 ` JeffyChen
2018-01-11 12:24 ` Robin Murphy
2018-01-12 1:22 ` JeffyChen
2018-01-11 12:26 ` Marek Szyprowski
2018-01-11 8:22 ` [PATCH 2/9] iommu/rockchip: Fix error handling in attach Jeffy Chen
2018-01-11 15:47 ` Robin Murphy
2018-01-12 0:33 ` JeffyChen
2018-01-11 8:22 ` Jeffy Chen [this message]
2018-01-11 8:22 ` [PATCH 4/9] iommu/rockchip: Fix error handling in init Jeffy Chen
2018-01-11 8:22 ` [PATCH 5/9] iommu/rockchip: Use iopoll helpers to wait for hardware Jeffy Chen
2018-01-11 8:22 ` [PATCH 6/9] iommu/rockchip: Fix TLB flush of secondary IOMMUs Jeffy Chen
2018-01-11 8:22 ` [PATCH 7/9] iommu/rockchip: Use iommu_group_get_for_dev() for add_device Jeffy Chen
2018-01-11 8:22 ` [PATCH 8/9] iommu/rockchip: Use IOMMU device for dma mapping operations Jeffy Chen
2018-01-11 8:22 ` [PATCH 9/9] iommu/rockchip: Use OF_IOMMU to attach devices automatically Jeffy Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180111082229.24011-4-jeffy.chen@rock-chips.com \
--to=jeffy.chen@rock-chips.com \
--cc=heiko@sntech.de \
--cc=iommu@lists.linux-foundation.org \
--cc=jcliang@chromium.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=robin.murphy@arm.com \
--cc=tfiga@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®