From: Jeffy Chen <jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Jeffy Chen <jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
jcliang-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
Subject: [PATCH v4 02/13] iommu/rockchip: Fix error handling in probe
Date: Thu, 18 Jan 2018 19:52:40 +0800 [thread overview]
Message-ID: <20180118115251.5542-3-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <20180118115251.5542-1-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
Add missing iommu_device_sysfs_remove in error path.
Signed-off-by: Jeffy Chen <jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
Reviewed-by: Tomasz Figa <tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
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 16cd8780c289..c2ef3cbd4401 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1193,8 +1193,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 const struct of_device_id rk_iommu_dt_ids[] = {
--
2.11.0
next prev parent reply other threads:[~2018-01-18 11:52 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-18 11:52 [PATCH v4 00/13] iommu/rockchip: Use OF_IOMMU Jeffy Chen
[not found] ` <20180118115251.5542-1-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-18 11:52 ` [PATCH v4 01/13] iommu/rockchip: Prohibit unbind and remove Jeffy Chen
2018-01-18 11:52 ` Jeffy Chen [this message]
2018-01-18 11:52 ` [PATCH v4 04/13] iommu/rockchip: Fix error handling in attach Jeffy Chen
[not found] ` <20180118115251.5542-5-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-18 13:23 ` Robin Murphy
2018-01-18 14:22 ` JeffyChen
2018-01-18 11:52 ` [PATCH v4 06/13] iommu/rockchip: Fix TLB flush of secondary IOMMUs Jeffy Chen
2018-01-18 11:52 ` [PATCH v4 08/13] iommu/rockchip: Control clocks needed to access the IOMMU Jeffy Chen
[not found] ` <20180118115251.5542-9-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-18 12:27 ` Robin Murphy
2018-01-18 14:25 ` JeffyChen
[not found] ` <5A60AE41.2050101-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-22 1:18 ` Randy Li
[not found] ` <1f4b3c0d-1414-0012-a072-f4a11f432c21-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-22 2:15 ` JeffyChen
[not found] ` <5A654925.9020203-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-22 4:09 ` JeffyChen
[not found] ` <5A6563FA.8080602-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-24 9:51 ` Tomasz Figa
2018-01-25 9:42 ` Randy Li
[not found] ` <c05d4794-b76d-cfaa-d7ed-c44108117ee2-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-25 10:24 ` JeffyChen
[not found] ` <5A69B065.30501-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-02-23 10:36 ` JeffyChen
2018-01-18 11:52 ` [PATCH v4 09/13] iommu/rockchip: Use IOMMU device for dma mapping operations Jeffy Chen
[not found] ` <20180118115251.5542-10-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-18 12:35 ` Robin Murphy
2018-01-18 11:52 ` [PATCH v4 10/13] iommu/rockchip: Use OF_IOMMU to attach devices automatically Jeffy Chen
[not found] ` <20180118115251.5542-11-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-18 12:46 ` Robin Murphy
2018-01-18 11:52 ` [PATCH v4 12/13] iommu/rockchip: Add runtime PM support Jeffy Chen
[not found] ` <20180118115251.5542-13-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-19 4:01 ` Tomasz Figa
2018-01-18 11:52 ` [PATCH v4 03/13] iommu/rockchip: Request irqs in rk_iommu_probe() Jeffy Chen
2018-01-18 11:52 ` [PATCH v4 05/13] iommu/rockchip: Use iopoll helpers to wait for hardware Jeffy Chen
[not found] ` <20180118115251.5542-6-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-18 13:09 ` Robin Murphy
[not found] ` <064794b9-98ae-221e-76bd-e11130514826-5wv7dgnIgG8@public.gmane.org>
2018-01-18 14:11 ` JeffyChen
2018-01-18 11:52 ` [PATCH v4 11/13] iommu/rockchip: Fix error handling in init Jeffy Chen
2018-01-18 12:47 ` Robin Murphy
2018-01-18 11:52 ` [PATCH v4 13/13] iommu/rockchip: Support sharing IOMMU between masters Jeffy Chen
[not found] ` <20180118115251.5542-14-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-18 12:49 ` Robin Murphy
2018-01-18 12:44 ` [PATCH v4 00/13] iommu/rockchip: Use OF_IOMMU Joerg Roedel
2018-01-18 14:07 ` JeffyChen
[not found] ` <20180118115251.5542-8-jeffy.chen@rock-chips.com>
[not found] ` <CAAFQd5ACbV6Q2Jwze=hoG=13jSJKkYyDDs2HzvvdSK-RGK+w2g@mail.gmail.com>
[not found] ` <CAAFQd5ACbV6Q2Jwze=hoG=13jSJKkYyDDs2HzvvdSK-RGK+w2g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-01-19 4:55 ` [PATCH v4 07/13] ARM: dts: rockchip: add clocks in vop iommu nodes JeffyChen
[not found] ` <5A617A5E.6070606-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-01-19 5:12 ` Tomasz Figa
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=20180118115251.5542-3-jeffy.chen@rock-chips.com \
--to=jeffy.chen-tnx95d0mmh7dzftrwevzcw@public.gmane.org \
--cc=heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=jcliang-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.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;
as well as URLs for NNTP newsgroup(s).