From: heiko@sntech.de (Heiko Stübner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] i2c: s3c2410: check for NULL pinctrl handle
Date: Sat, 23 Feb 2013 18:57:46 +0100 [thread overview]
Message-ID: <201302231857.46445.heiko@sntech.de> (raw)
In-Reply-To: <201302231855.47560.heiko@sntech.de>
When pinctrl is not built the fallback functions fail silently
and emit either 0 error codes or NULL pinctrl handles.
Therefore it's needed to also check for this NULL-handle when
falling back to parsing the i2c gpios from devicetree.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
drivers/i2c/busses/i2c-s3c2410.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index f6b880b..e58337f 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -1060,7 +1060,8 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
if (i2c->pdata->cfg_gpio) {
i2c->pdata->cfg_gpio(to_platform_device(i2c->dev));
- } else if (IS_ERR(i2c->pctrl) && s3c24xx_i2c_parse_dt_gpio(i2c)) {
+ } else if ((!i2c->pctrl || IS_ERR(i2c->pctrl)) &&
+ s3c24xx_i2c_parse_dt_gpio(i2c)) {
return -EINVAL;
}
--
1.7.2.3
next prev parent reply other threads:[~2013-02-23 17:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-23 17:55 [PATCH] pinctrl or i2c-s3c2410: fix pinctrl NULL return values in stubs Heiko Stübner
2013-02-23 17:56 ` [PATCH] pinctrl: return real error codes when pinctrl is not included Heiko Stübner
2013-02-24 0:40 ` Linus Walleij
2013-02-24 22:34 ` Heiko Stübner
2013-02-24 22:42 ` Linus Walleij
2013-02-24 23:15 ` Heiko Stübner
2013-02-23 17:57 ` Heiko Stübner [this message]
2013-02-24 0:16 ` [PATCH] i2c: s3c2410: check for NULL pinctrl handle Linus Walleij
2013-02-24 0:38 ` Tomasz Figa
2013-02-24 0:47 ` Linus Walleij
2013-02-24 0:58 ` Tomasz Figa
2013-02-24 1:01 ` Linus Walleij
2013-02-24 17:00 ` Tomasz Figa
2013-02-24 22:39 ` Linus Walleij
2013-02-24 23:16 ` Heiko Stübner
2013-02-25 0:02 ` 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=201302231857.46445.heiko@sntech.de \
--to=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.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).