From: Sergio Paracuellos <sergio.paracuellos@gmail.com>
To: linus.walleij@linaro.org
Cc: robh+dt@kernel.org, gregkh@linuxfoundation.org,
yanaijie@huawei.com, linux-gpio@vger.kernel.org,
devicetree@vger.kernel.org, devel@driverdev.osuosl.org,
Dan Carpenter <dan.carpenter@oracle.com>
Subject: [PATCH 6/8] pinctrl: ralink: rt2880: preserve error codes
Date: Sun, 13 Dec 2020 17:17:19 +0100 [thread overview]
Message-ID: <20201213161721.6514-7-sergio.paracuellos@gmail.com> (raw)
In-Reply-To: <20201213161721.6514-1-sergio.paracuellos@gmail.com>
Some paths in probe function are returning '-EINVAL'
instead of preserve original code from called functions.
Change them to preserve all of them.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
---
drivers/pinctrl/ralink/pinctrl-rt2880.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/pinctrl/ralink/pinctrl-rt2880.c b/drivers/pinctrl/ralink/pinctrl-rt2880.c
index 4725aa34328a..5af1c8a20322 100644
--- a/drivers/pinctrl/ralink/pinctrl-rt2880.c
+++ b/drivers/pinctrl/ralink/pinctrl-rt2880.c
@@ -315,6 +315,7 @@ static int rt2880_pinmux_probe(struct platform_device *pdev)
{
struct rt2880_priv *p;
struct pinctrl_dev *dev;
+ int err;
if (!rt2880_pinmux_data)
return -ENOTSUPP;
@@ -330,13 +331,16 @@ static int rt2880_pinmux_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, p);
/* init the device */
- if (rt2880_pinmux_index(p)) {
+ err = rt2880_pinmux_index(p);
+ if (err) {
dev_err(&pdev->dev, "failed to load index\n");
- return -EINVAL;
+ return err;
}
- if (rt2880_pinmux_pins(p)) {
+
+ err = rt2880_pinmux_pins(p);
+ if (err) {
dev_err(&pdev->dev, "failed to load pins\n");
- return -EINVAL;
+ return err;
}
dev = pinctrl_register(p->desc, &pdev->dev, p);
if (IS_ERR(dev))
--
2.25.1
next prev parent reply other threads:[~2020-12-13 16:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-13 16:17 [PATCH 0/8] pinctrl: ralink: rt2880: Some minimal clean ups Sergio Paracuellos
2020-12-13 16:17 ` [PATCH 1/8] dt-bindings: pinctrl: rt2880: properly redo bindings Sergio Paracuellos
2020-12-15 17:02 ` Rob Herring
2020-12-13 16:17 ` [PATCH 2/8] pinctrl: ralink: rt2880: avoid double pointer to simplify code Sergio Paracuellos
2020-12-13 16:17 ` [PATCH 3/8] pinctrl: ralink: rt2880: return proper error code Sergio Paracuellos
2020-12-13 16:17 ` [PATCH 4/8] pinctrl: ralink: rt2880: add missing NULL check Sergio Paracuellos
2020-12-13 16:17 ` [PATCH 5/8] pinctrl: ralink: rt2880: delete not needed error message Sergio Paracuellos
2020-12-13 16:17 ` Sergio Paracuellos [this message]
2020-12-13 16:17 ` [PATCH 7/8] pinctrl: ralink: rt2880: use 'PTR_ERR_OR_ZERO' Sergio Paracuellos
2020-12-13 16:17 ` [PATCH 8/8] staging: mt7621-dts: properly name pinctrl related nodes Sergio Paracuellos
2020-12-14 9:01 ` [PATCH 0/8] pinctrl: ralink: rt2880: Some minimal clean ups Linus Walleij
2020-12-14 9:39 ` Sergio Paracuellos
2021-01-04 14:39 ` Linus Walleij
2021-01-04 14:45 ` Sergio Paracuellos
2021-01-04 14:55 ` 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=20201213161721.6514-7-sergio.paracuellos@gmail.com \
--to=sergio.paracuellos@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=yanaijie@huawei.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;
as well as URLs for NNTP newsgroup(s).