* [PATCH] clk: lmk04832: fix checks for allocation failure
@ 2021-06-30 13:49 Dan Carpenter
2021-06-30 16:00 ` Liam Beguin
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2021-06-30 13:49 UTC (permalink / raw)
To: Michael Turquette, Liam Beguin
Cc: Stephen Boyd, linux-clk, linux-kernel, kernel-janitors
The devm_kcalloc() function returns NULL on error, it never returns
error pointers so these conditions need to be fixed.
Fixes: 3bc61cfd6f4a ("clk: add support for the lmk04832")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/clk/clk-lmk04832.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/clk/clk-lmk04832.c b/drivers/clk/clk-lmk04832.c
index 0cd76e626c3d..66ad5cbe7029 100644
--- a/drivers/clk/clk-lmk04832.c
+++ b/drivers/clk/clk-lmk04832.c
@@ -1425,23 +1425,23 @@ static int lmk04832_probe(struct spi_device *spi)
lmk->dclk = devm_kcalloc(lmk->dev, info->num_channels >> 1,
sizeof(struct lmk_dclk), GFP_KERNEL);
- if (IS_ERR(lmk->dclk)) {
- ret = PTR_ERR(lmk->dclk);
+ if (!lmk->dclk) {
+ ret = -ENOMEM;
goto err_disable_oscin;
}
lmk->clkout = devm_kcalloc(lmk->dev, info->num_channels,
sizeof(*lmk->clkout), GFP_KERNEL);
- if (IS_ERR(lmk->clkout)) {
- ret = PTR_ERR(lmk->clkout);
+ if (!lmk->clkout) {
+ ret = -ENOMEM;
goto err_disable_oscin;
}
lmk->clk_data = devm_kzalloc(lmk->dev, struct_size(lmk->clk_data, hws,
info->num_channels),
GFP_KERNEL);
- if (IS_ERR(lmk->clk_data)) {
- ret = PTR_ERR(lmk->clk_data);
+ if (!lmk->clk_data) {
+ ret = -ENOMEM;
goto err_disable_oscin;
}
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* RE: [PATCH] clk: lmk04832: fix checks for allocation failure
2021-06-30 13:49 [PATCH] clk: lmk04832: fix checks for allocation failure Dan Carpenter
@ 2021-06-30 16:00 ` Liam Beguin
0 siblings, 0 replies; 2+ messages in thread
From: Liam Beguin @ 2021-06-30 16:00 UTC (permalink / raw)
To: Dan Carpenter, Michael Turquette
Cc: Stephen Boyd, linux-clk, linux-kernel, kernel-janitors
Hi Dan,
> -----Original Message-----
> From: Dan Carpenter <dan.carpenter@oracle.com>
> Sent: June 30, 2021 9:50 AM
> To: Michael Turquette <mturquette@baylibre.com>; Liam Beguin
> <lvb@xiphos.com>
> Cc: Stephen Boyd <sboyd@kernel.org>; linux-clk@vger.kernel.org; linux-
> kernel@vger.kernel.org; kernel-janitors@vger.kernel.org
> Subject: [PATCH] clk: lmk04832: fix checks for allocation failure
>
> The devm_kcalloc() function returns NULL on error, it never returns
> error pointers so these conditions need to be fixed.
>
> Fixes: 3bc61cfd6f4a ("clk: add support for the lmk04832")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
A similar patch was posted earlier yesterday. See [1]
[1] https://patchwork.kernel.org/project/linux-clk/patch/20210630020322.2555946-1-wanghai38@huawei.com/
Liam
> ---
> drivers/clk/clk-lmk04832.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/clk/clk-lmk04832.c b/drivers/clk/clk-lmk04832.c
> index 0cd76e626c3d..66ad5cbe7029 100644
> --- a/drivers/clk/clk-lmk04832.c
> +++ b/drivers/clk/clk-lmk04832.c
> @@ -1425,23 +1425,23 @@ static int lmk04832_probe(struct spi_device
> *spi)
>
> lmk->dclk = devm_kcalloc(lmk->dev, info->num_channels >> 1,
> sizeof(struct lmk_dclk), GFP_KERNEL);
> - if (IS_ERR(lmk->dclk)) {
> - ret = PTR_ERR(lmk->dclk);
> + if (!lmk->dclk) {
> + ret = -ENOMEM;
> goto err_disable_oscin;
> }
>
> lmk->clkout = devm_kcalloc(lmk->dev, info->num_channels,
> sizeof(*lmk->clkout), GFP_KERNEL);
> - if (IS_ERR(lmk->clkout)) {
> - ret = PTR_ERR(lmk->clkout);
> + if (!lmk->clkout) {
> + ret = -ENOMEM;
> goto err_disable_oscin;
> }
>
> lmk->clk_data = devm_kzalloc(lmk->dev, struct_size(lmk->clk_data,
> hws,
> info-
> >num_channels),
> GFP_KERNEL);
> - if (IS_ERR(lmk->clk_data)) {
> - ret = PTR_ERR(lmk->clk_data);
> + if (!lmk->clk_data) {
> + ret = -ENOMEM;
> goto err_disable_oscin;
> }
>
> --
> 2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-30 16:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-30 13:49 [PATCH] clk: lmk04832: fix checks for allocation failure Dan Carpenter
2021-06-30 16:00 ` Liam Beguin
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).