From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: linux-kernel@vger.kernel.org
Cc: jcliang@chromium.org, robin.murphy@arm.com, xxm@rock-chips.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 v7 02/14] iommu/rockchip: Fix error handling in probe
Date: Tue, 6 Mar 2018 11:02:40 +0800 [thread overview]
Message-ID: <20180306030252.3197-3-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <20180306030252.3197-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>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
---
Changes in v7: None
Changes in v6: None
Changes in v5: None
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-03-06 3:03 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-06 3:02 [PATCH v7 00/14] iommu/rockchip: Use OF_IOMMU Jeffy Chen
2018-03-06 3:02 ` [PATCH v7 01/14] iommu/rockchip: Prohibit unbind and remove Jeffy Chen
2018-03-07 12:55 ` Robin Murphy
2018-03-06 3:02 ` Jeffy Chen [this message]
2018-03-07 12:59 ` [PATCH v7 02/14] iommu/rockchip: Fix error handling in probe Robin Murphy
2018-03-06 3:02 ` [PATCH v7 03/14] iommu/rockchip: Request irqs in rk_iommu_probe() Jeffy Chen
2018-03-07 13:00 ` Robin Murphy
2018-03-06 3:21 ` [PATCH v7 04/14] iommu/rockchip: Fix error handling in attach Jeffy Chen
2018-03-06 3:21 ` [PATCH v7 05/14] iommu/rockchip: Use iopoll helpers to wait for hardware Jeffy Chen
2018-03-06 3:21 ` [PATCH v7 06/14] iommu/rockchip: Fix TLB flush of secondary IOMMUs Jeffy Chen
2018-03-06 3:21 ` [PATCH v7 07/14] ARM: dts: rockchip: add clocks in iommu nodes Jeffy Chen
2018-03-06 3:21 ` [PATCH v7 08/14] iommu/rockchip: Control clocks needed to access the IOMMU Jeffy Chen
2018-03-06 3:21 ` [PATCH v7 09/14] dt-bindings: iommu/rockchip: Add clock property Jeffy Chen
2018-03-07 13:01 ` Robin Murphy
2018-03-06 3:27 ` [PATCH v7 10/14] iommu/rockchip: Use IOMMU device for dma mapping operations Jeffy Chen
2018-03-06 3:27 ` [PATCH v7 11/14] iommu/rockchip: Use OF_IOMMU to attach devices automatically Jeffy Chen
2018-03-06 3:27 ` [PATCH v7 12/14] iommu/rockchip: Fix error handling in init Jeffy Chen
2018-03-06 3:27 ` [PATCH v7 13/14] iommu/rockchip: Add runtime PM support Jeffy Chen
2018-03-06 10:07 ` Tomasz Figa
2018-03-07 3:24 ` Tomasz Figa
[not found] ` <5A9F598E.4020704@rock-chips.com>
2018-03-07 3:26 ` Tomasz Figa
2018-03-06 3:27 ` [PATCH v7 14/14] iommu/rockchip: Support sharing IOMMU between masters 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=20180306030252.3197-3-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 \
--cc=xxm@rock-chips.com \
/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®