From mboxrd@z Thu Jan 1 00:00:00 1970 From: narmstrong@baylibre.com (Neil Armstrong) Date: Mon, 20 Jun 2016 12:03:54 +0200 Subject: [PATCH] clk: Fix return value check in oxnas_stdclk_probe() In-Reply-To: <1466184263-17890-1-git-send-email-weiyj_lk@163.com> References: <1466184263-17890-1-git-send-email-weiyj_lk@163.com> Message-ID: <5767BF8A.6080204@baylibre.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 06/17/2016 07:24 PM, weiyj_lk at 163.com wrote: > From: Wei Yongjun > > In case of error, the function syscon_node_to_regmap() returns > ERR_PTR() and never returns NULL. The NULL test in the return > value check should be replaced with IS_ERR(). > > Signed-off-by: Wei Yongjun > --- > drivers/clk/clk-oxnas.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/clk-oxnas.c b/drivers/clk/clk-oxnas.c > index efba7d4..79bcb2e 100644 > --- a/drivers/clk/clk-oxnas.c > +++ b/drivers/clk/clk-oxnas.c > @@ -144,9 +144,9 @@ static int oxnas_stdclk_probe(struct platform_device *pdev) > return -ENOMEM; > > regmap = syscon_node_to_regmap(of_get_parent(np)); > - if (!regmap) { > + if (IS_ERR(regmap)) { > dev_err(&pdev->dev, "failed to have parent regmap\n"); > - return -EINVAL; > + return PTR_ERR(regmap); > } > > for (i = 0; i < ARRAY_SIZE(clk_oxnas_init); i++) { > > > Correct. Acked-by: Neil Armstrong Thanks, Neil