From: Siddharth Gupta <sidgup@codeaurora.org>
To: bjorn.andersson@linaro.org, ohad@wizery.com,
linux-remoteproc@vger.kernel.org
Cc: Siddharth Gupta <sidgup@codeaurora.org>,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, psodagud@codeaurora.org,
stable@vger.kernel.org
Subject: [PATCH v3 4/4] remoteproc: core: Cleanup device in case of failure
Date: Mon, 14 Jun 2021 19:21:11 -0700 [thread overview]
Message-ID: <1623723671-5517-5-git-send-email-sidgup@codeaurora.org> (raw)
In-Reply-To: <1623723671-5517-1-git-send-email-sidgup@codeaurora.org>
When a failure occurs in rproc_add() it returns an error, but does
not cleanup after itself. This change adds the failure path in such
cases.
Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org>
---
drivers/remoteproc/remoteproc_core.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index b874280..d823f70 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -2343,8 +2343,10 @@ int rproc_add(struct rproc *rproc)
return ret;
ret = device_add(dev);
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ put_device(dev);
+ goto rproc_remove_cdev;
+ }
dev_info(dev, "%s is available\n", rproc->name);
@@ -2355,7 +2357,7 @@ int rproc_add(struct rproc *rproc)
if (rproc->auto_boot) {
ret = rproc_trigger_auto_boot(rproc);
if (ret < 0)
- return ret;
+ goto rproc_remove_dev;
}
/* expose to rproc_get_by_phandle users */
@@ -2364,6 +2366,13 @@ int rproc_add(struct rproc *rproc)
mutex_unlock(&rproc_list_mutex);
return 0;
+
+rproc_remove_dev:
+ rproc_delete_debug_dir(rproc);
+ device_del(dev);
+rproc_remove_cdev:
+ rproc_char_device_remove(rproc);
+ return ret;
}
EXPORT_SYMBOL(rproc_add);
--
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2021-06-15 2:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 2:21 [PATCH v3 0/4] remoteproc: core: Fixes for rproc cdev and add Siddharth Gupta
2021-06-15 2:21 ` [PATCH v3 1/4] remoteproc: core: Move cdev add before device add Siddharth Gupta
2021-06-15 4:54 ` Greg KH
2021-06-15 4:56 ` Greg KH
2021-06-15 19:03 ` Siddharth Gupta
2021-06-16 5:58 ` Greg KH
2021-06-16 18:47 ` Siddharth Gupta
2021-06-23 7:27 ` Greg KH
2021-06-23 18:56 ` Siddharth Gupta
2021-06-15 2:21 ` [PATCH v3 2/4] remoteproc: core: Move validate " Siddharth Gupta
2021-06-15 4:54 ` Greg KH
2021-06-15 2:21 ` [PATCH v3 3/4] remoteproc: core: Fix cdev remove and rproc del Siddharth Gupta
2021-06-15 4:54 ` Greg KH
2021-06-15 2:21 ` Siddharth Gupta [this message]
2021-06-15 4:54 ` [PATCH v3 4/4] remoteproc: core: Cleanup device in case of failure Greg KH
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=1623723671-5517-5-git-send-email-sidgup@codeaurora.org \
--to=sidgup@codeaurora.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=ohad@wizery.com \
--cc=psodagud@codeaurora.org \
--cc=stable@vger.kernel.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).