[PATCH -next] clk: sunxi-ng: de2: fix wrong pointer passed to PTR_ERR()

Subsystems: arm/allwinner sunxi soc support, common clk framework, the rest

STALE3399d

2 messages, 2 authors, 2017-05-19 · open the first message on its own page

[PATCH -next] clk: sunxi-ng: de2: fix wrong pointer passed to PTR_ERR()

From: Wei Yongjun <hidden>
Date: 2017-05-18 15:55:13

From: Wei Yongjun <redacted>

PTR_ERR should access the value just tested by IS_ERR, otherwise
the wrong error code will be returned.

Fixes: b0d9a4bd52bd ("clk: sunxi-ng: add support for DE2 CCU")
Signed-off-by: Wei Yongjun <redacted>
---
 drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-de2.c b/drivers/clk/sunxi-ng/ccu-sun8i-de2.c
index 15aaa9c..5cdaf52 100644
--- a/drivers/clk/sunxi-ng/ccu-sun8i-de2.c
+++ b/drivers/clk/sunxi-ng/ccu-sun8i-de2.c
@@ -184,7 +184,7 @@ static int sunxi_de2_clk_probe(struct platform_device *pdev)
 
 	rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
 	if (IS_ERR(rstc)) {
-		ret = PTR_ERR(bus_clk);
+		ret = PTR_ERR(rstc);
 		if (ret != -EPROBE_DEFER)
 			dev_err(&pdev->dev,
 				"Couldn't get reset control: %d\n", ret);

Re: [PATCH -next] clk: sunxi-ng: de2: fix wrong pointer passed to PTR_ERR()

From: Maxime Ripard <hidden>
Date: 2017-05-19 08:26:31

On Thu, May 18, 2017 at 03:55:13PM +0000, Wei Yongjun wrote:
From: Wei Yongjun <redacted>

PTR_ERR should access the value just tested by IS_ERR, otherwise
the wrong error code will be returned.

Fixes: b0d9a4bd52bd ("clk: sunxi-ng: add support for DE2 CCU")
Signed-off-by: Wei Yongjun <redacted>
Applied, thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170519/3c6fb3d9/attachment.sig>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help