From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-clk@vger.kernel.org
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>,
Stephen Boyd <sboyd@codeaurora.org>,
Michael Turquette <mturquette@baylibre.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] clk: prevent __of_clk_get_hw_from_provider() from returning NULL
Date: Tue, 19 Jul 2016 18:03:58 +0900 [thread overview]
Message-ID: <1468919039-23004-1-git-send-email-yamada.masahiro@socionext.com> (raw)
The .get(_hw) callback of an OF clock provider can return a NULL
pointer in some cases.
For example, of_clk_src_onecell_get() returns NULL for index 1 of a
sparse array of clocks like follows:
clk_num == 3
idx 0: UART clk
idx 1: NULL (no clk is allocated)
idx 2: I2C clk
In such cases, clk_get() successfully returns NULL.
A problem is that most drivers only check IS_ERR(), like follows:
clk = devm_clk_get(dev, NULL);
if (IS_ERR(clk))
return PTR_ERR(clk);
It carries on moving forward and will probably be hit by a different
error check with a different error message.
Let's make __of_clk_get_hw_from_provider() return ERR_PTR(-ENOENT)
if the .get(_hw) returns NULL.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
drivers/clk/clk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 953643f..484acc2 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -3117,7 +3117,7 @@ __of_clk_get_hw_from_provider(struct of_clk_provider *provider,
hw = ERR_CAST(clk);
}
- return hw;
+ return hw ?: ERR_PTR(-ENOENT);
}
struct clk *__of_clk_get_from_provider(struct of_phandle_args *clkspec,
--
1.9.1
next reply other threads:[~2016-07-19 9:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-19 9:03 Masahiro Yamada [this message]
2016-08-04 20:57 ` [PATCH] clk: prevent __of_clk_get_hw_from_provider() from returning NULL Stephen Boyd
2016-08-05 8:29 ` Sylwester Nawrocki
2016-08-07 17:05 ` Masahiro Yamada
2016-08-10 8:16 ` Masahiro Yamada
2016-08-10 23:23 ` Stephen Boyd
2016-08-12 6:59 ` Masahiro Yamada
2016-08-13 7:38 ` Russell King - ARM Linux
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=1468919039-23004-1-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@codeaurora.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).